glib-aux: use nm_uuid_parse() helper

4 files changed, 3 insertions, 15 deletions

diff --git a/src/core/nm-core-utils.c b/src/core/nm-core-utils.c
index ec7bcab059..0bb5040829 100644
--- a/src/core/nm-core-utils.c
+++ b/src/core/nm-core-utils.c
@@ -2854,7 +2854,7 @@ again:
                                    NULL,
                                    NULL,
                                    NULL);
-        if (!contents || !_nm_utils_uuid_parse(nm_strstrip(contents), &uuid)) {
+        if (!contents || !nm_uuid_parse(nm_strstrip(contents), &uuid)) {
             /* generate a random UUID instead. */
             is_fake = TRUE;
             _nm_utils_uuid_generate_random(&uuid);
diff --git a/src/libnm-core-impl/nm-utils.c b/src/libnm-core-impl/nm-utils.c
index 761c627063..11a59e50f6 100644
--- a/src/libnm-core-impl/nm-utils.c
+++ b/src/libnm-core-impl/nm-utils.c
@@ -3045,17 +3045,6 @@ _nm_utils_sriov_vf_from_strparts(const char *index,
 /*****************************************************************************/
 
 NMUuid *
-_nm_utils_uuid_parse(const char *str, NMUuid *out_uuid)
-{
-    nm_assert(str);
-    nm_assert(out_uuid);
-
-    if (uuid_parse(str, out_uuid->uuid) != 0)
-        return NULL;
-    return out_uuid;
-}
-
-NMUuid *
 _nm_utils_uuid_generate_random(NMUuid *out_uuid)
 {
     nm_assert(out_uuid);
@@ -3148,7 +3137,7 @@ nm_utils_uuid_generate_from_string_bin(NMUuid *    uuid,
 
         if (type_args) {
             /* type_args can be a name space UUID. Interpret it as (char *) */
-            if (!_nm_utils_uuid_parse(type_args, &ns_uuid))
+            if (!nm_uuid_parse(type_args, &ns_uuid))
                 g_return_val_if_reached(NULL);
         }
 
diff --git a/src/libnm-core-impl/tests/test-general.c b/src/libnm-core-impl/tests/test-general.c
index 0cd8ad9475..3000779951 100644
--- a/src/libnm-core-impl/tests/test-general.c
+++ b/src/libnm-core-impl/tests/test-general.c
@@ -7219,7 +7219,7 @@ _uuid(const char *str)
     static NMUuid u;
 
     g_assert(str);
-    g_assert(_nm_utils_uuid_parse(str, &u));
+    g_assert(nm_uuid_parse(str, &u));
     return &u;
 }
 
diff --git a/src/libnm-core-intern/nm-core-internal.h b/src/libnm-core-intern/nm-core-internal.h
index 66b102a1f3..79fe36dd53 100644
--- a/src/libnm-core-intern/nm-core-internal.h
+++ b/src/libnm-core-intern/nm-core-internal.h
@@ -352,7 +352,6 @@ gboolean _nm_utils_check_module_file(const char *              name,
 
 /*****************************************************************************/
 
-NMUuid *_nm_utils_uuid_parse(const char *str, NMUuid *uuid);
 NMUuid *_nm_utils_uuid_generate_random(NMUuid *out_uuid);
 
 gboolean nm_utils_uuid_is_null(const NMUuid *uuid);