luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-09 04:15:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

gdbusconnection: Factor out signal_data_new_take()

Browse Source 
No functional changes, except that the implicit ownership-transfer
for the rule field becomes explicit (the local variable is set to NULL
afterwards).

Signed-off-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Simon McVittie 2024-03-14 19:30:12 +00:00
parent 8dfea5609e
commit 816da60571
1 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
gio/gdbusconnection.c
View File

@ -336,6 +336,30 @@ typedef struct
GPtrArray *subscribers; /* (owned) (element-type SignalSubscriber) */ GPtrArray *subscribers; /* (owned) (element-type SignalSubscriber) */
} SignalData; } SignalData;
static SignalData *
signal_data_new_take (gchar *rule,
gchar *sender,
gchar *sender_unique_name,
gchar *interface_name,
gchar *member,
gchar *object_path,
gchar *arg0,
GDBusSignalFlags flags)
{
SignalData *signal_data = g_new0 (SignalData, 1);
signal_data->rule = rule;
signal_data->sender = sender;
signal_data->sender_unique_name = sender_unique_name;
signal_data->interface_name = interface_name;
signal_data->member = member;
signal_data->object_path = object_path;
signal_data->arg0 = arg0;
signal_data->flags = flags;
signal_data->subscribers = g_ptr_array_new_with_free_func ((GDestroyNotify) signal_subscriber_unref);
return g_steal_pointer (&signal_data);
}
static void static void
signal_data_free (SignalData *signal_data) signal_data_free (SignalData *signal_data)
{ {
@ -3578,16 +3602,14 @@ g_dbus_connection_signal_subscribe (GDBusConnection *connection,
goto out; goto out;
} }
signal_data = g_new0 (SignalData, 1); signal_data = signal_data_new_take (g_steal_pointer (&rule),
signal_data->rule = rule; g_strdup (sender),
signal_data->sender = g_strdup (sender); g_strdup (sender_unique_name),
signal_data->sender_unique_name = g_strdup (sender_unique_name); g_strdup (interface_name),
signal_data->interface_name = g_strdup (interface_name); g_strdup (member),
signal_data->member = g_strdup (member); g_strdup (object_path),
signal_data->object_path = g_strdup (object_path); g_strdup (arg0),
signal_data->arg0 = g_strdup (arg0); flags);
signal_data->flags = flags;
signal_data->subscribers = g_ptr_array_new_with_free_func ((GDestroyNotify) signal_subscriber_unref);
g_ptr_array_add (signal_data->subscribers, subscriber); g_ptr_array_add (signal_data->subscribers, subscriber);
g_hash_table_insert (connection->map_rule_to_signal_data, g_hash_table_insert (connection->map_rule_to_signal_data,