fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-09 08:18:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

shared: refactor nm_utils_strdict_to_variant_ass() to use nm_utils_named_values_from_strdict()

Browse source 
It is pretty much the same code this way, but shorter.
This commit is contained in:
Thomas Haller 2020-06-07 01:04:05 +02:00
parent cdb38df7e5
commit fff812e255
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 15 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
shared/nm-glib-aux/nm-shared-utils.c
View file

@ -478,50 +478,25 @@ nm_utils_gbytes_to_variant_ay (GBytes *bytes)
GVariant * GVariant *
nm_utils_strdict_to_variant_ass (GHashTable *strdict) nm_utils_strdict_to_variant_ass (GHashTable *strdict)
{ {
GHashTableIter iter; gs_free NMUtilsNamedValue *values_free = NULL;
const char *key, *value; NMUtilsNamedValue values_prepared[20];
const NMUtilsNamedValue *values;
GVariantBuilder builder; GVariantBuilder builder;
guint i, len; guint i;
guint n;
values = nm_utils_named_values_from_strdict (strdict,
&n,
values_prepared,
&values_free);
g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{ss}")); g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{ss}"));
for (i = 0; i < n; i++) {
if (!strdict) g_variant_builder_add (&builder,
goto out; "{ss}",
len = g_hash_table_size (strdict); values[i].name,
if (!len) values[i].value_str);
goto out;
g_hash_table_iter_init (&iter, strdict);
if (!g_hash_table_iter_next (&iter, (gpointer *) &key, (gpointer *) &value))
nm_assert_not_reached ();
if (len == 1)
g_variant_builder_add (&builder, "{ss}", key, value);
else {
gs_free NMUtilsNamedValue *idx_free = NULL;
NMUtilsNamedValue *idx;
if (len > 300 / sizeof (NMUtilsNamedValue)) {
idx_free = g_new (NMUtilsNamedValue, len);
idx = idx_free;
} else
idx = g_alloca (sizeof (NMUtilsNamedValue) * len);
i = 0;
do {
idx[i].name = key;
idx[i].value_str = value;
i++;
} while (g_hash_table_iter_next (&iter, (gpointer *) &key, (gpointer *) &value));
nm_assert (i == len);
nm_utils_named_value_list_sort (idx, len, NULL, NULL);
for (i = 0; i < len; i++)
g_variant_builder_add (&builder, "{ss}", idx[i].name, idx[i].value_str);
} }
out:
return g_variant_builder_end (&builder); return g_variant_builder_end (&builder);
} }