From 5bd03fd9a35a0e783e1740166fbc94cbb28185e4 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Sun, 2 May 2021 22:30:31 +0200 Subject: [PATCH] libnm: use nm_uuid_is_valid_nmlegacy() to implement nm_utils_is_uuid() --- src/libnm-core-impl/nm-utils.c | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/src/libnm-core-impl/nm-utils.c b/src/libnm-core-impl/nm-utils.c index 39248378ff..1d2c216a5b 100644 --- a/src/libnm-core-impl/nm-utils.c +++ b/src/libnm-core-impl/nm-utils.c @@ -4438,28 +4438,7 @@ nm_utils_iface_valid_name(const char *name) gboolean nm_utils_is_uuid(const char *str) { - const char *p = str; - int num_dashes = 0; - - if (!p) - return FALSE; - - while (*p) { - if (*p == '-') - num_dashes++; - else if (!g_ascii_isxdigit(*p)) - return FALSE; - p++; - } - - if ((num_dashes == 4) && (p - str == 36)) - return TRUE; - - /* Backwards compat for older configurations */ - if ((num_dashes == 0) && (p - str == 40)) - return TRUE; - - return FALSE; + return nm_uuid_is_valid_nmlegacy(str); } static _nm_thread_local char _nm_utils_inet_ntop_buffer[NM_UTILS_INET_ADDRSTRLEN];