From dd1a618745a5dff77a8373a54af7c76cccdba02e Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Sun, 2 May 2021 14:17:32 +0200
Subject: [PATCH] libnm,glib-aux: move nm_utils_uuid_is_null() to "nm-uuid.h"

---
 src/core/nm-core-utils.c                 |  2 +-
 src/libnm-core-impl/nm-utils.c           | 15 ---------------
 src/libnm-core-impl/tests/test-general.c |  8 ++++----
 src/libnm-core-intern/nm-core-internal.h |  2 --
 src/libnm-glib-aux/nm-uuid.c             | 17 +++++++++++++++++
 src/libnm-glib-aux/nm-uuid.h             |  2 ++
 6 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/src/core/nm-core-utils.c b/src/core/nm-core-utils.c
index cb4d88e55a..19ff105911 100644
--- a/src/core/nm-core-utils.c
+++ b/src/core/nm-core-utils.c
@@ -2455,7 +2455,7 @@ again:
                                          (guint8 *) &uuid,
                                          sizeof(uuid),
                                          NULL)) {
-                if (!nm_utils_uuid_is_null(&uuid)) {
+                if (!nm_uuid_is_null(&uuid)) {
                     /* an all-zero machine-id is not valid. */
                     is_fake = FALSE;
                 }
diff --git a/src/libnm-core-impl/nm-utils.c b/src/libnm-core-impl/nm-utils.c
index 932206f3bc..75e06e9127 100644
--- a/src/libnm-core-impl/nm-utils.c
+++ b/src/libnm-core-impl/nm-utils.c
@@ -3043,21 +3043,6 @@ _nm_utils_sriov_vf_from_strparts(const char *index,
 
 /*****************************************************************************/
 
-gboolean
-nm_utils_uuid_is_null(const NMUuid *uuid)
-{
-    int i;
-
-    if (!uuid)
-        return TRUE;
-
-    for (i = 0; i < (int) G_N_ELEMENTS(uuid->uuid); i++) {
-        if (uuid->uuid[i])
-            return FALSE;
-    }
-    return TRUE;
-}
-
 /**
  * nm_utils_uuid_generate_buf_:
  * @buf: input buffer, must contain at least 37 bytes
diff --git a/src/libnm-core-impl/tests/test-general.c b/src/libnm-core-impl/tests/test-general.c
index 3000779951..537b1e7784 100644
--- a/src/libnm-core-impl/tests/test-general.c
+++ b/src/libnm-core-impl/tests/test-general.c
@@ -7859,10 +7859,10 @@ test_nm_utils_uuid_generate_from_strings(void)
 
     g_assert_cmpmem(&uuid0, sizeof(uuid0), _uuid("00000000-0000-0000-0000-000000000000"), 16);
 
-    g_assert(nm_utils_uuid_is_null(NULL));
-    g_assert(nm_utils_uuid_is_null(&uuid0));
-    g_assert(nm_utils_uuid_is_null(_uuid("00000000-0000-0000-0000-000000000000")));
-    g_assert(!nm_utils_uuid_is_null(_uuid("10000000-0000-0000-0000-000000000000")));
+    g_assert(nm_uuid_is_null(NULL));
+    g_assert(nm_uuid_is_null(&uuid0));
+    g_assert(nm_uuid_is_null(_uuid("00000000-0000-0000-0000-000000000000")));
+    g_assert(!nm_uuid_is_null(_uuid("10000000-0000-0000-0000-000000000000")));
 
     _test_uuid("b07c334a-399b-32de-8d50-58e4e08f98e3", "", 0, NULL);
     _test_uuid("b8a426cb-bcb5-30a3-bd8f-6786fea72df9", "\0", 1, "");
diff --git a/src/libnm-core-intern/nm-core-internal.h b/src/libnm-core-intern/nm-core-internal.h
index 86630c0bf7..db10c572a4 100644
--- a/src/libnm-core-intern/nm-core-internal.h
+++ b/src/libnm-core-intern/nm-core-internal.h
@@ -352,8 +352,6 @@ gboolean _nm_utils_check_module_file(const char *              name,
 
 /*****************************************************************************/
 
-gboolean nm_utils_uuid_is_null(const NMUuid *uuid);
-
 #define NM_UTILS_UUID_TYPE_LEGACY   0
 #define NM_UTILS_UUID_TYPE_VERSION3 3
 #define NM_UTILS_UUID_TYPE_VERSION5 5
diff --git a/src/libnm-glib-aux/nm-uuid.c b/src/libnm-glib-aux/nm-uuid.c
index 199c3df4b2..3d94c4e337 100644
--- a/src/libnm-glib-aux/nm-uuid.c
+++ b/src/libnm-glib-aux/nm-uuid.c
@@ -125,3 +125,20 @@ nm_uuid_generate_random(NMUuid *out_uuid)
 
     return out_uuid;
 }
+
+/*****************************************************************************/
+
+gboolean
+nm_uuid_is_null(const NMUuid *uuid)
+{
+    int i;
+
+    if (!uuid)
+        return TRUE;
+
+    for (i = 0; i < (int) G_N_ELEMENTS(uuid->uuid); i++) {
+        if (uuid->uuid[i])
+            return FALSE;
+    }
+    return TRUE;
+}
diff --git a/src/libnm-glib-aux/nm-uuid.h b/src/libnm-glib-aux/nm-uuid.h
index 812886eed0..5b3a1a44e5 100644
--- a/src/libnm-glib-aux/nm-uuid.h
+++ b/src/libnm-glib-aux/nm-uuid.h
@@ -29,4 +29,6 @@ nm_uuid_parse(const char *str, NMUuid *out_uuid)
 
 NMUuid *nm_uuid_generate_random(NMUuid *out_uuid);
 
+gboolean nm_uuid_is_null(const NMUuid *uuid);
+
 #endif /* __NM_UUID_H__ */