summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2023-11-17 09:05:04 +0100
committerThomas Haller <thaller@redhat.com>2023-11-30 15:53:21 +0100
commit503a76f6049b2405dc7773e03789bd6aa17d8b44 (patch)
tree1cc1efacf7650c30d10fbdb7960e5d94957fedcb
parentcb5ef4b3a0a62122da0cda616967de623f378bd7 (diff)
all: use nm_strv_empty_new() helper
-rw-r--r--src/contrib/nm-vpn-editor-plugin-call.h2
-rw-r--r--src/libnm-client-impl/nm-ip-config.c2
-rw-r--r--src/libnm-core-impl/nm-vpn-plugin-info.c2
-rw-r--r--src/libnm-glib-aux/nm-shared-utils.c2
-rw-r--r--src/libnm-glib-aux/nm-shared-utils.h6
-rw-r--r--src/libnm-glib-aux/nm-test-utils.h2
-rw-r--r--src/libnm-glib-aux/tests/test-shared-general.c2
-rw-r--r--src/nmcli/utils.c2
-rw-r--r--src/nmtui/nmt-address-list.c2
9 files changed, 11 insertions, 11 deletions
diff --git a/src/contrib/nm-vpn-editor-plugin-call.h b/src/contrib/nm-vpn-editor-plugin-call.h
index bf6036ee17..2f3eb0740c 100644
--- a/src/contrib/nm-vpn-editor-plugin-call.h
+++ b/src/contrib/nm-vpn-editor-plugin-call.h
@@ -103,7 +103,7 @@ nm_vpn_editor_plugin_get_service_add_details(NMVpnEditorPlugin *plugin, const ch
if (vt.fcn_get_service_add_details)
details = vt.fcn_get_service_add_details(plugin, service_name);
if (!details)
- return g_new0(char *, 1);
+ return nm_strv_empty_new();
return details;
}
diff --git a/src/libnm-client-impl/nm-ip-config.c b/src/libnm-client-impl/nm-ip-config.c
index 9aa2e778ce..c054f2ccd6 100644
--- a/src/libnm-client-impl/nm-ip-config.c
+++ b/src/libnm-client-impl/nm-ip-config.c
@@ -190,7 +190,7 @@ next:
if (arr && arr->len > 0)
nameservers_new = nm_strv_dup((char **) arr->pdata, arr->len, FALSE);
else
- nameservers_new = g_new0(char *, 1);
+ nameservers_new = nm_strv_empty_new();
}
nm_assert(nameservers_new);
}
diff --git a/src/libnm-core-impl/nm-vpn-plugin-info.c b/src/libnm-core-impl/nm-vpn-plugin-info.c
index 588df91726..223d8ab33b 100644
--- a/src/libnm-core-impl/nm-vpn-plugin-info.c
+++ b/src/libnm-core-impl/nm-vpn-plugin-info.c
@@ -728,7 +728,7 @@ nm_vpn_plugin_info_list_get_service_types(GSList *list,
if (l->len <= 0) {
g_ptr_array_free(l, TRUE);
- return g_new0(char *, 1);
+ return nm_strv_empty_new();
}
/* sort the result and remove duplicates. */
diff --git a/src/libnm-glib-aux/nm-shared-utils.c b/src/libnm-glib-aux/nm-shared-utils.c
index 99bb8d6e18..40bb59200d 100644
--- a/src/libnm-glib-aux/nm-shared-utils.c
+++ b/src/libnm-glib-aux/nm-shared-utils.c
@@ -1937,7 +1937,7 @@ nm_utils_strsplit_quoted(const char *str)
}
if (!arr)
- return g_new0(char *, 1);
+ return nm_strv_empty_new();
/* We want to return an optimally sized strv array, with no excess
* memory allocated. Hence, clone once more. */
diff --git a/src/libnm-glib-aux/nm-shared-utils.h b/src/libnm-glib-aux/nm-shared-utils.h
index 8d2e542b5e..11c87bec8f 100644
--- a/src/libnm-glib-aux/nm-shared-utils.h
+++ b/src/libnm-glib-aux/nm-shared-utils.h
@@ -1860,7 +1860,7 @@ char **nm_strv_make_deep_copied_n(const char **strv, gsize len);
static inline char **
nm_strv_make_deep_copied_nonnull(const char **strv)
{
- return nm_strv_make_deep_copied(strv) ?: g_new0(char *, 1);
+ return nm_strv_make_deep_copied(strv) ?: nm_strv_empty_new();
}
char **_nm_strv_dup(const char *const *strv, gssize len, gboolean deep_copied);
@@ -3110,7 +3110,7 @@ nm_strvarray_get_strv_full_dup(const GArray *arr,
{
if (!arr) {
NM_SET_OUT(length, 0);
- return not_null ? g_new0(char *, 1) : NULL;
+ return not_null ? nm_strv_empty_new() : NULL;
}
nm_assert(sizeof(char *) == g_array_get_element_size((GArray *) arr));
@@ -3119,7 +3119,7 @@ nm_strvarray_get_strv_full_dup(const GArray *arr,
if (arr->len == 0) {
if (preserve_empty || not_null)
- return g_new0(char *, 1);
+ return nm_strv_empty_new();
return NULL;
}
diff --git a/src/libnm-glib-aux/nm-test-utils.h b/src/libnm-glib-aux/nm-test-utils.h
index 627151fa21..ca93d649ea 100644
--- a/src/libnm-glib-aux/nm-test-utils.h
+++ b/src/libnm-glib-aux/nm-test-utils.h
@@ -1228,7 +1228,7 @@ nmtst_rand_perm_strv(const char *const *strv)
/* this returns a (scrambled) SHALLOW copy of the strv array! */
n = NM_PTRARRAY_LEN(strv);
- res = (const char **) (nm_strv_dup(strv, n, FALSE) ?: g_new0(char *, 1));
+ res = (const char **) (nm_strv_dup(strv, n, FALSE) ?: nm_strv_empty_new());
nmtst_rand_perm(NULL, res, res, sizeof(char *), n);
return res;
}
diff --git a/src/libnm-glib-aux/tests/test-shared-general.c b/src/libnm-glib-aux/tests/test-shared-general.c
index 55f8cbb1d1..e65c0efc1d 100644
--- a/src/libnm-glib-aux/tests/test-shared-general.c
+++ b/src/libnm-glib-aux/tests/test-shared-general.c
@@ -450,7 +450,7 @@ _strv_cmp_fuzz_input(const char *const *in,
if (l < 0)
ss = g_strdupv((char **) in);
else if (l == 0) {
- ss = nmtst_get_rand_bool() ? NULL : g_new0(char *, 1);
+ ss = nmtst_get_rand_bool() ? NULL : nm_strv_empty_new();
} else {
ss = nm_memdup(in, sizeof(const char *) * l);
for (i = 0; i < (gsize) l; i++)
diff --git a/src/nmcli/utils.c b/src/nmcli/utils.c
index 615d1f8656..c65a5486bc 100644
--- a/src/nmcli/utils.c
+++ b/src/nmcli/utils.c
@@ -497,7 +497,7 @@ nmc_string_to_arg_array(const char *line,
arr0 = nm_strsplit_set(line ?: "", delim ?: " \t");
if (!arr0)
- arr = g_new0(char *, 1);
+ arr = nm_strv_empty_new();
else
arr = g_strdupv((char **) arr0);
diff --git a/src/nmtui/nmt-address-list.c b/src/nmtui/nmt-address-list.c
index dba8e790c5..ff4bf1a475 100644
--- a/src/nmtui/nmt-address-list.c
+++ b/src/nmtui/nmt-address-list.c
@@ -194,7 +194,7 @@ nmt_address_list_set_property(GObject *object,
g_strfreev(priv->strings);
priv->strings = g_value_dup_boxed(value);
if (!priv->strings)
- priv->strings = g_new0(char *, 1);
+ priv->strings = nm_strv_empty_new();
nmt_widget_list_set_length(NMT_WIDGET_LIST(object), g_strv_length(priv->strings));
break;
default: