fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-06 11:28:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm: use NMStrBuf in _nm_utils_uuid_generate_from_strings()

Browse source
This commit is contained in:
Thomas Haller 2020-06-21 13:17:04 +02:00
parent 936e457cc0
commit 2edb3aa81a
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
libnm-core/nm-utils.c
View file

@ -20,6 +20,7 @@
#include "nm-json.h" #include "nm-json.h"
#endif #endif
#include "nm-glib-aux/nm-str-buf.h"
#include "nm-glib-aux/nm-enum-utils.h" #include "nm-glib-aux/nm-enum-utils.h"
#include "nm-glib-aux/nm-time-utils.h" #include "nm-glib-aux/nm-time-utils.h"
#include "nm-glib-aux/nm-secret-utils.h" #include "nm-glib-aux/nm-secret-utils.h"
@ -3300,30 +3301,29 @@ nm_utils_uuid_generate_from_string (const char *s, gssize slen, int uuid_type, g
char * char *
_nm_utils_uuid_generate_from_strings (const char *string1, ...) _nm_utils_uuid_generate_from_strings (const char *string1, ...)
{ {
GString *str;
va_list args;
const char *s;
char *uuid;
if (!string1) if (!string1)
return nm_utils_uuid_generate_from_string (NULL, 0, NM_UTILS_UUID_TYPE_VERSION3, NM_UTILS_UUID_NS); return nm_utils_uuid_generate_from_string (NULL, 0, NM_UTILS_UUID_TYPE_VERSION3, NM_UTILS_UUID_NS);
str = g_string_sized_new (120); /* effectively allocates power of 2 (128)*/ {
nm_auto_str_buf NMStrBuf str = NM_STR_BUF_INIT (NM_UTILS_GET_NEXT_REALLOC_SIZE_104, FALSE);
va_list args;
const char *s;
g_string_append_len (str, string1, strlen (string1) + 1); nm_str_buf_append_len (&str, string1, strlen (string1) + 1u);
va_start (args, string1); va_start (args, string1);
s = va_arg (args, const char *);
while (s) {
g_string_append_len (str, s, strlen (s) + 1);
s = va_arg (args, const char *); s = va_arg (args, const char *);
while (s) {
nm_str_buf_append_len (&str, s, strlen (s) + 1u);
s = va_arg (args, const char *);
}
va_end (args);
return nm_utils_uuid_generate_from_string (nm_str_buf_get_str_unsafe (&str),
str.len,
NM_UTILS_UUID_TYPE_VERSION3,
NM_UTILS_UUID_NS);
} }
va_end (args);
uuid = nm_utils_uuid_generate_from_string (str->str, str->len, NM_UTILS_UUID_TYPE_VERSION3, NM_UTILS_UUID_NS);
g_string_free (str, TRUE);
return uuid;
} }
/*****************************************************************************/ /*****************************************************************************/