mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

idxset: Use pa_free_cb_t instead of pa_free2_cb_t

Browse source 
There were no users for the userdata pointer.
This commit is contained in:
Tanu Kaskinen 2013-02-12 21:36:55 +02:00
parent 43e7868008
commit 061878b5a4
27 changed files with 81 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/pulsecore/protocol-dbus.c
View file

@ -171,7 +171,7 @@ void pa_dbus_protocol_unref(pa_dbus_protocol *p) {
pa_hashmap_free(p->objects, NULL);
pa_hashmap_free(p->connections, NULL);
pa_idxset_free(p->extensions, NULL, NULL);
pa_idxset_free(p->extensions, NULL);
for (i = 0; i < PA_DBUS_PROTOCOL_HOOK_MAX; ++i)
pa_hook_done(&p->hooks[i]);
@ -928,22 +928,15 @@ static struct signal_paths_entry *signal_paths_entry_new(const char *signal_name
}
static void signal_paths_entry_free(struct signal_paths_entry *e) {
char *path = NULL;
pa_assert(e);
pa_xfree(e->signal);
while ((path = pa_idxset_steal_first(e->paths, NULL)))
pa_xfree(path);
pa_idxset_free(e->paths, NULL, NULL);
pa_idxset_free(e->paths, pa_xfree);
pa_xfree(e);
}
int pa_dbus_protocol_unregister_connection(pa_dbus_protocol *p, DBusConnection *conn) {
struct connection_entry *conn_entry = NULL;
char *object_path = NULL;
pa_assert(p);
pa_assert(conn);
@ -954,12 +947,7 @@ int pa_dbus_protocol_unregister_connection(pa_dbus_protocol *p, DBusConnection *
unregister_all_objects(p, conn);
dbus_connection_unref(conn_entry->connection);
while ((object_path = pa_idxset_steal_first(conn_entry->all_signals_objects, NULL)))
pa_xfree(object_path);
pa_idxset_free(conn_entry->all_signals_objects, NULL, NULL);
pa_idxset_free(conn_entry->all_signals_objects, pa_xfree);
pa_hashmap_free(conn_entry->listening_signals, (pa_free_cb_t) signal_paths_entry_free);
pa_xfree(conn_entry);