From 418d20acc9c241cbd5a832a21ddbc9946b8815ca Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Tue, 25 Aug 2020 11:51:32 +0200 Subject: [PATCH] shared: add nm_strvarray_remove_first() Co-authored-by: Thomas Haller --- shared/nm-glib-aux/nm-shared-utils.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/shared/nm-glib-aux/nm-shared-utils.h b/shared/nm-glib-aux/nm-shared-utils.h index a1e142d3ff..cf13142ddf 100644 --- a/shared/nm-glib-aux/nm-shared-utils.h +++ b/shared/nm-glib-aux/nm-shared-utils.h @@ -2190,6 +2190,24 @@ 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) +{ + guint i; + + nm_assert (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; + } + } + } + return FALSE; +} + /*****************************************************************************/ struct _NMVariantAttributeSpec {