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

glib-aux: add nm_strvarray_find_first() helper

Browse source
This commit is contained in:
Thomas Haller 2021-06-02 14:19:20 +02:00
parent b0acbe504f
commit 851267b6e7
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2795,8 +2795,8 @@ nm_strvarray_set_strv(GArray **array, const char *const *strv)
nm_strvarray_add(*array, strv[0]);
}
static inline gboolean
nm_strvarray_remove_first(GArray *strv, const char *needle)
static inline gssize
nm_strvarray_find_first(GArray *strv, const char *needle)
{
guint i;
@ -2804,13 +2804,25 @@ nm_strvarray_remove_first(GArray *strv, const char *needle)
if (strv) {
for (i = 0; i < strv->len; i++) {
if (nm_streq(needle, g_array_index(strv, const char *, i))) {
g_array_remove_index(strv, i);
return TRUE;
}
if (nm_streq(needle, g_array_index(strv, const char *, i)))
return i;
}
}
return FALSE;
return -1;
}
static inline gboolean
nm_strvarray_remove_first(GArray *strv, const char *needle)
{
gssize idx;
nm_assert(needle);
idx = nm_strvarray_find_first(strv, needle);
if (idx < 0)
return FALSE;
g_array_remove_index(strv, idx);
return TRUE;
}
/*****************************************************************************/