From 0b95cd5b801be00f2d175aa356502d5883ab712a Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 17 Nov 2023 09:51:36 +0100 Subject: [PATCH] libnm: drop unused nm_strv_to_ptrarray() helper It also doesn't make much sense to have this. We may use a GPtrArray to construct and keep track of a (dynamic) strv list. Then we add the strings to the GPtrArray one by one. We almost never will want to create a GPtrArray based on a strv array. --- src/libnm-core-impl/nm-utils.c | 18 ------------------ src/libnm-core-intern/nm-core-internal.h | 1 - 2 files changed, 19 deletions(-) diff --git a/src/libnm-core-impl/nm-utils.c b/src/libnm-core-impl/nm-utils.c index 0dda3915ac..998a0b91ad 100644 --- a/src/libnm-core-impl/nm-utils.c +++ b/src/libnm-core-impl/nm-utils.c @@ -897,24 +897,6 @@ _nm_utils_slist_to_strv(const GSList *slist, gboolean deep_copy) return strv; } -GPtrArray * -nm_strv_to_ptrarray(char **strv) -{ - GPtrArray *ptrarray; - gsize i, l; - - l = NM_PTRARRAY_LEN(strv); - - ptrarray = g_ptr_array_new_full(l, g_free); - - if (strv) { - for (i = 0; strv[i]; i++) - g_ptr_array_add(ptrarray, g_strdup(strv[i])); - } - - return ptrarray; -} - char ** _nm_utils_ptrarray_to_strv(const GPtrArray *ptrarray) { diff --git a/src/libnm-core-intern/nm-core-internal.h b/src/libnm-core-intern/nm-core-internal.h index 673348c640..8bbb2c64fb 100644 --- a/src/libnm-core-intern/nm-core-internal.h +++ b/src/libnm-core-intern/nm-core-internal.h @@ -347,7 +347,6 @@ GPtrArray *_nm_utils_copy_object_array(const GPtrArray *array); GSList *nm_strv_to_gslist(char **strv, gboolean deep_copy); char **_nm_utils_slist_to_strv(const GSList *slist, gboolean deep_copy); -GPtrArray *nm_strv_to_ptrarray(char **strv); char **_nm_utils_ptrarray_to_strv(const GPtrArray *ptrarray); gboolean _nm_utils_check_file(const char *filename,