luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-26 05:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

gdbus: refactor duplicate code for freeing FilterData

Browse Source
This commit is contained in:
Thomas Haller 2021-03-28 08:53:57 +02:00
parent e7f6799668
commit 60d4092a2c
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
gio/gdbusconnection.c
View File

@ -2202,6 +2202,24 @@ typedef struct
GMainContext *context; GMainContext *context;
} FilterData; } FilterData;
static void
filter_data_destroy (FilterData *filter, gboolean notify_sync)
{
if (notify_sync)
{
if (filter->user_data_free_func != NULL)
filter->user_data_free_func (filter->user_data);
}
else
{
call_destroy_notify (filter->context,
filter->user_data_free_func,
filter->user_data);
}
g_main_context_unref (filter->context);
g_free (filter);
}
/* requires CONNECTION_LOCK */ /* requires CONNECTION_LOCK */
static FilterData ** static FilterData **
copy_filter_list (GPtrArray *filters) copy_filter_list (GPtrArray *filters)
@ -2230,13 +2248,7 @@ free_filter_list (FilterData **filters)
{ {
filters[n]->ref_count--; filters[n]->ref_count--;
if (filters[n]->ref_count == 0) if (filters[n]->ref_count == 0)
{ filter_data_destroy (filters[n], FALSE);
call_destroy_notify (filters[n]->context,
filters[n]->user_data_free_func,
filters[n]->user_data);
g_main_context_unref (filters[n]->context);
g_free (filters[n]);
}
} }
g_free (filters); g_free (filters);
} }
@ -3179,16 +3191,9 @@ static void
purge_all_filters (GDBusConnection *connection) purge_all_filters (GDBusConnection *connection)
{ {
guint n; guint n;
for (n = 0; n < connection->filters->len; n++)
{
FilterData *data = connection->filters->pdata[n];
call_destroy_notify (data->context, for (n = 0; n < connection->filters->len; n++)
data->user_data_free_func, filter_data_destroy (connection->filters->pdata[n], FALSE);
data->user_data);
g_main_context_unref (data->context);
g_free (data);
}
} }
/** /**
@ -3238,12 +3243,7 @@ g_dbus_connection_remove_filter (GDBusConnection *connection,
/* do free without holding lock */ /* do free without holding lock */
if (to_destroy != NULL) if (to_destroy != NULL)
{ filter_data_destroy (to_destroy, TRUE);
if (to_destroy->user_data_free_func != NULL)
to_destroy->user_data_free_func (to_destroy->user_data);
g_main_context_unref (to_destroy->context);
g_free (to_destroy);
}
else if (!found) else if (!found)
{ {
g_warning ("g_dbus_connection_remove_filter: No filter found for filter_id %d", filter_id); g_warning ("g_dbus_connection_remove_filter: No filter found for filter_id %d", filter_id);