From b8a57fb2725961759bdf45f1156fa7ef2c4d0498 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 27 Aug 2018 13:11:16 +0200 Subject: [PATCH] libnm-core: remove unused utlity functions for GSList I think GSList is not a great data type. Most of the time when we used it, we better had choosen another data type. These utility functions were unused, and I think we should use GSList less. Drop them. --- libnm-core/nm-core-internal.h | 6 ------ libnm-core/nm-utils.c | 33 --------------------------------- 2 files changed, 39 deletions(-) diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h index 23e5dd71d8..3dbbb7aa64 100644 --- a/libnm-core/nm-core-internal.h +++ b/libnm-core/nm-core-internal.h @@ -238,12 +238,6 @@ _nm_auto_ip_route_unref (NMIPRoute **v) } #define nm_auto_ip_route_unref nm_auto (_nm_auto_ip_route_unref) -GPtrArray *_nm_utils_copy_slist_to_array (const GSList *list, - NMUtilsCopyFunc copy_func, - GDestroyNotify unref_func); -GSList *_nm_utils_copy_array_to_slist (const GPtrArray *array, - NMUtilsCopyFunc copy_func); - GPtrArray *_nm_utils_copy_array (const GPtrArray *array, NMUtilsCopyFunc copy_func, GDestroyNotify free_func); diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c index 9565c0af39..cb71d6e77d 100644 --- a/libnm-core/nm-utils.c +++ b/libnm-core/nm-utils.c @@ -622,39 +622,6 @@ _nm_utils_copy_strdict (GHashTable *strdict) return copy; } -GPtrArray * -_nm_utils_copy_slist_to_array (const GSList *list, - NMUtilsCopyFunc copy_func, - GDestroyNotify unref_func) -{ - const GSList *iter; - GPtrArray *array; - - array = g_ptr_array_new_with_free_func (unref_func); - for (iter = list; iter; iter = iter->next) - g_ptr_array_add (array, copy_func ? copy_func (iter->data) : iter->data); - return array; -} - -GSList * -_nm_utils_copy_array_to_slist (const GPtrArray *array, - NMUtilsCopyFunc copy_func) -{ - GSList *slist = NULL; - gpointer item; - int i; - - if (!array) - return NULL; - - for (i = 0; i < array->len; i++) { - item = array->pdata[i]; - slist = g_slist_prepend (slist, copy_func (item)); - } - - return g_slist_reverse (slist); -} - GPtrArray * _nm_utils_copy_array (const GPtrArray *array, NMUtilsCopyFunc copy_func,