summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2019-04-25 08:25:34 +0200
committerThomas Haller <thaller@redhat.com>2019-04-25 08:53:51 +0200
commit6d472dacb432611beb825a27163fa63562511f99 (patch)
tree2f30a36bc60d028e2a6ad6ecb63bb1211dc535b2
parent020c4c81d82ad314f1998b271a4fdfbf96e1b7c3 (diff)
downloadNetworkManager-6d472dacb432611beb825a27163fa63562511f99.tar.gz
shared: add nm_utils_named_value_list_*() utils
nm_utils_named_value_list_find(), nm_utils_named_value_list_sort(), and nm_utils_named_value_list_is_sorted().
-rw-r--r--shared/nm-glib-aux/nm-shared-utils.c96
-rw-r--r--shared/nm-glib-aux/nm-shared-utils.h18
2 files changed, 114 insertions, 0 deletions
diff --git a/shared/nm-glib-aux/nm-shared-utils.c b/shared/nm-glib-aux/nm-shared-utils.c
index cf08a77fde..07441323ce 100644
--- a/shared/nm-glib-aux/nm-shared-utils.c
+++ b/shared/nm-glib-aux/nm-shared-utils.c
@@ -2130,6 +2130,8 @@ nm_utils_fd_read_loop_exact (int fd, void *buf, size_t nbytes, bool do_poll)
return 0;
}
+/*****************************************************************************/
+
NMUtilsNamedValue *
nm_utils_named_values_from_str_dict (GHashTable *hash, guint *out_len)
{
@@ -2163,6 +2165,100 @@ nm_utils_named_values_from_str_dict (GHashTable *hash, guint *out_len)
return values;
}
+gssize
+nm_utils_named_value_list_find (const NMUtilsNamedValue *arr,
+ gsize len,
+ const char *name,
+ gboolean sorted)
+{
+ gsize i;
+
+ nm_assert (name);
+
+#if NM_MORE_ASSERTS > 5
+ {
+ for (i = 0; i < len; i++) {
+ const NMUtilsNamedValue *v = &arr[i];
+
+ nm_assert (v->name);
+ if ( sorted
+ && i > 0)
+ nm_assert (strcmp (arr[i - 1].name, v->name) < 0);
+ }
+ }
+
+ nm_assert ( !sorted
+ || nm_utils_named_value_list_is_sorted (arr, len, FALSE, NULL, NULL));
+#endif
+
+ if (sorted) {
+ return nm_utils_array_find_binary_search (arr,
+ sizeof (NMUtilsNamedValue),
+ len,
+ &name,
+ nm_strcmp_p_with_data,
+ NULL);
+ }
+ for (i = 0; i < len; i++) {
+ if (nm_streq (arr[i].name, name))
+ return i;
+ }
+ return ~((gssize) len);
+}
+
+gboolean
+nm_utils_named_value_list_is_sorted (const NMUtilsNamedValue *arr,
+ gsize len,
+ gboolean accept_duplicates,
+ GCompareDataFunc compare_func,
+ gpointer user_data)
+{
+ gsize i;
+ int c_limit;
+
+ if (len == 0)
+ return TRUE;
+
+ g_return_val_if_fail (arr, FALSE);
+
+ if (!compare_func)
+ compare_func = nm_strcmp_p_with_data;
+
+ c_limit = accept_duplicates ? 0 : -1;
+
+ for (i = 1; i < len; i++) {
+ int c;
+
+ c = compare_func (&arr[i - 1], &arr[i], user_data);
+ if (c > c_limit)
+ return FALSE;
+ }
+ return TRUE;
+}
+
+void
+nm_utils_named_value_list_sort (NMUtilsNamedValue *arr,
+ gsize len,
+ GCompareDataFunc compare_func,
+ gpointer user_data)
+{
+ if (len == 0)
+ return;
+
+ g_return_if_fail (arr);
+
+ if (len == 1)
+ return;
+
+ g_qsort_with_data (arr,
+ len,
+ sizeof (NMUtilsNamedValue),
+ compare_func ?: nm_strcmp_p_with_data,
+ user_data);
+}
+
+/*****************************************************************************/
+
gpointer *
nm_utils_hash_keys_to_array (GHashTable *hash,
GCompareDataFunc compare_func,
diff --git a/shared/nm-glib-aux/nm-shared-utils.h b/shared/nm-glib-aux/nm-shared-utils.h
index af3c2f830b..aec61fe073 100644
--- a/shared/nm-glib-aux/nm-shared-utils.h
+++ b/shared/nm-glib-aux/nm-shared-utils.h
@@ -911,6 +911,24 @@ typedef struct {
NMUtilsNamedValue *nm_utils_named_values_from_str_dict (GHashTable *hash, guint *out_len);
+gssize nm_utils_named_value_list_find (const NMUtilsNamedValue *arr,
+ gsize len,
+ const char *name,
+ gboolean sorted);
+
+gboolean nm_utils_named_value_list_is_sorted (const NMUtilsNamedValue *arr,
+ gsize len,
+ gboolean accept_duplicates,
+ GCompareDataFunc compare_func,
+ gpointer user_data);
+
+void nm_utils_named_value_list_sort (NMUtilsNamedValue *arr,
+ gsize len,
+ GCompareDataFunc compare_func,
+ gpointer user_data);
+
+/*****************************************************************************/
+
gpointer *nm_utils_hash_keys_to_array (GHashTable *hash,
GCompareDataFunc compare_func,
gpointer user_data,