From 414ce2236e98e7e37d128ee8d4025b8740231db5 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Sun, 2 May 2021 21:41:43 +0200
Subject: [PATCH] glib-aux: add NMUuidType enum for
 nm_uuid_generate_from_string()

Let's have an enum instead of plain "int" and #define.
---
 src/libnm-glib-aux/nm-uuid.c |  7 +++++--
 src/libnm-glib-aux/nm-uuid.h | 16 ++++++++++------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/libnm-glib-aux/nm-uuid.c b/src/libnm-glib-aux/nm-uuid.c
index 3ebfb25138..7497b7c489 100644
--- a/src/libnm-glib-aux/nm-uuid.c
+++ b/src/libnm-glib-aux/nm-uuid.c
@@ -176,7 +176,7 @@ NMUuid *
 nm_uuid_generate_from_string(NMUuid *    uuid,
                              const char *s,
                              gssize      slen,
-                             int         uuid_type,
+                             NMUuidType  uuid_type,
                              gpointer    type_args)
 {
     g_return_val_if_fail(uuid, FALSE);
@@ -250,7 +250,10 @@ nm_uuid_generate_from_string(NMUuid *    uuid,
  * object's #NMSettingConnection:id: property
  **/
 char *
-nm_uuid_generate_from_string_str(const char *s, gssize slen, int uuid_type, gpointer type_args)
+nm_uuid_generate_from_string_str(const char *s,
+                                 gssize      slen,
+                                 NMUuidType  uuid_type,
+                                 gpointer    type_args)
 {
     NMUuid uuid;
 
diff --git a/src/libnm-glib-aux/nm-uuid.h b/src/libnm-glib-aux/nm-uuid.h
index 59b69a0336..c4a6bdb57c 100644
--- a/src/libnm-glib-aux/nm-uuid.h
+++ b/src/libnm-glib-aux/nm-uuid.h
@@ -47,18 +47,22 @@ char *nm_uuid_generate_random_str(char buf[static 37]);
 
 /*****************************************************************************/
 
-#define NM_UUID_TYPE_LEGACY   0
-#define NM_UUID_TYPE_VERSION3 3
-#define NM_UUID_TYPE_VERSION5 5
+typedef enum {
+    NM_UUID_TYPE_LEGACY   = 0,
+    NM_UUID_TYPE_VERSION3 = 3,
+    NM_UUID_TYPE_VERSION5 = 5,
+} NMUuidType;
 
 NMUuid *nm_uuid_generate_from_string(NMUuid *    uuid,
                                      const char *s,
                                      gssize      slen,
-                                     int         uuid_type,
+                                     NMUuidType  uuid_type,
                                      gpointer    type_args);
 
-char *
-nm_uuid_generate_from_string_str(const char *s, gssize slen, int uuid_type, gpointer type_args);
+char *nm_uuid_generate_from_string_str(const char *s,
+                                       gssize      slen,
+                                       NMUuidType  uuid_type,
+                                       gpointer    type_args);
 
 /* arbitrarily chosen namespace UUID for nm_uuid_generate_from_strings() */
 #define NM_UUID_NS1 "b425e9fb-7598-44b4-9e3b-5a2e3aaa4905"