luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-09-27 17:52:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

gdbus-tool: Steal set values passing the ownership to an array

Browse Source
This commit is contained in:
Marco Trevisan (Treviño)
2022-12-14 04:59:24 +01:00
parent 1eb7f3177d
commit 036dabcff9
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
gio/gdbus-tool.c
View File

@@ -317,6 +317,12 @@ print_paths (GDBusConnection *c,
; ;
} }
static gint
ptr_strcmp0 (const gchar **a, const gchar **b)
{
return g_strcmp0 (*a, *b);
}
static void static void
print_names (GDBusConnection *c, print_names (GDBusConnection *c,
gboolean include_unique_names) gboolean include_unique_names)
@@ -326,8 +332,7 @@ print_names (GDBusConnection *c,
GVariantIter *iter; GVariantIter *iter;
gchar *str; gchar *str;
GHashTable *name_set; GHashTable *name_set;
GList *keys; GPtrArray *keys;
GList *l;
name_set = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); name_set = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
@@ -379,17 +384,17 @@ print_names (GDBusConnection *c,
g_variant_iter_free (iter); g_variant_iter_free (iter);
g_variant_unref (result); g_variant_unref (result);
keys = g_hash_table_get_keys (name_set); keys = g_hash_table_steal_all_keys (name_set);
keys = g_list_sort (keys, (GCompareFunc) g_strcmp0); g_ptr_array_sort (keys, (GCompareFunc) ptr_strcmp0);
for (l = keys; l != NULL; l = l->next) for (guint i = 0; i < keys->len; ++i)
{ {
const gchar *name = l->data; const gchar *name = g_ptr_array_index (keys, i);
if (!include_unique_names && g_str_has_prefix (name, ":")) if (!include_unique_names && g_str_has_prefix (name, ":"))
continue; continue;
g_print ("%s \n", name); g_print ("%s \n", name);
} }
g_list_free (keys); g_clear_pointer (&keys, g_ptr_array_unref);
out: out:
g_hash_table_unref (name_set); g_hash_table_unref (name_set);