fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-27 09:20:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

glib-aux/trivial: rename arguments in nm_strv_cleanup() function

Browse source 
"skip_repeated" sounds as if the function would only drop duplicate
elements that follow each other (in which case, the operation would be
O(n)). But it does search the entire array to prevent duplicates (resulting
in O(n^2)). Rename the argument "skip_repeated" to "no_duplicates"
to make that clearer.

Also, rename "skip_{empty,duplicates}" to "no_{empty,duplicates}". The
function removes those elements from the list, so "skip" is a bit
misleading too.
This commit is contained in:
Thomas Haller 2023-10-19 17:11:04 +02:00
parent ce3de03d14
commit 07428acf9e
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
2 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/libnm-glib-aux/nm-shared-utils.c
View file

@ -2076,7 +2076,7 @@ nm_strv_is_same_unordered(const char *const *strv1,
}
const char **
nm_strv_cleanup_const(const char **strv, gboolean skip_empty, gboolean skip_repeated)
nm_strv_cleanup_const(const char **strv, gboolean no_empty, gboolean no_duplicates)
{
gsize i;
gsize j;
@ -2084,12 +2084,12 @@ nm_strv_cleanup_const(const char **strv, gboolean skip_empty, gboolean skip_repe
if (!strv || !*strv)
return strv;
if (!skip_empty && !skip_repeated)
if (!no_empty && !no_duplicates)
return strv;
j = 0;
for (i = 0; strv[i]; i++) {
if ((skip_empty && !*strv[i]) || (skip_repeated && nm_strv_contains(strv, j, strv[i])))
if ((no_empty && !*strv[i]) || (no_duplicates && nm_strv_contains(strv, j, strv[i])))
continue;
strv[j++] = strv[i];
}
@ -2098,7 +2098,7 @@ nm_strv_cleanup_const(const char **strv, gboolean skip_empty, gboolean skip_repe
}
char **
nm_strv_cleanup(char **strv, gboolean strip_whitespace, gboolean skip_empty, gboolean skip_repeated)
nm_strv_cleanup(char **strv, gboolean strip_whitespace, gboolean no_empty, gboolean no_duplicates)
{
gsize i;
gsize j;
@ -2112,11 +2112,11 @@ nm_strv_cleanup(char **strv, gboolean strip_whitespace, gboolean skip_empty, gbo
for (i = 0; strv[i]; i++)
g_strstrip(strv[i]);
}
if (!skip_empty && !skip_repeated)
if (!no_empty && !no_duplicates)
return strv;
j = 0;
for (i = 0; strv[i]; i++) {
if ((skip_empty && !*strv[i]) || (skip_repeated && nm_strv_contains(strv, j, strv[i])))
if ((no_empty && !*strv[i]) || (no_duplicates && nm_strv_contains(strv, j, strv[i])))
g_free(strv[i]);
else
strv[j++] = strv[i];

8
src/libnm-glib-aux/nm-shared-utils.h
View file

@ -529,12 +529,10 @@ gssize _nm_strv_find_first(const char *const *list, gssize len, const char *need
gboolean nm_strv_has_duplicate(const char *const *list, gssize len, gboolean is_sorted);
const char **nm_strv_cleanup_const(const char **strv, gboolean skip_empty, gboolean skip_repeated);
const char **nm_strv_cleanup_const(const char **strv, gboolean no_empty, gboolean no_duplicates);
char **nm_strv_cleanup(char **strv,
gboolean strip_whitespace,
gboolean skip_empty,
gboolean skip_repeated);
char **
nm_strv_cleanup(char **strv, gboolean strip_whitespace, gboolean no_empty, gboolean no_duplicates);
gboolean nm_strv_is_same_unordered(const char *const *strv1,
gssize len1,