From 7514efc2f38c9ace4557d4e69d68e7d380389030 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 26 Aug 2016 02:18:32 +0200 Subject: Imported Upstream version 1.4.0 --- libnm-util/nm-utils.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'libnm-util/nm-utils.c') diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c index 717260af..f22b4f74 100644 --- a/libnm-util/nm-utils.c +++ b/libnm-util/nm-utils.c @@ -516,25 +516,13 @@ nm_utils_slist_free (GSList *list, GDestroyNotify elem_destroy_fn) g_slist_free_full (list, elem_destroy_fn); } -gboolean -_nm_utils_string_in_list (const char *str, const char **valid_strings) -{ - int i; - - for (i = 0; valid_strings[i]; i++) - if (strcmp (str, valid_strings[i]) == 0) - break; - - return valid_strings[i] != NULL; -} - gboolean _nm_utils_string_slist_validate (GSList *list, const char **valid_values) { GSList *iter; for (iter = list; iter; iter = iter->next) { - if (!_nm_utils_string_in_list ((char *) iter->data, valid_values)) + if (!g_strv_contains (valid_values, (char *) iter->data)) return FALSE; } -- cgit 1.3.0-6-gf8a5