From 8872c238ba6748c76455ecc6827b83ebcb1dd469 Mon Sep 17 00:00:00 2001 From: Tanu Kaskinen Date: Tue, 12 Feb 2013 21:36:53 +0200 Subject: hashmap: Use pa_free_cb_t instead of pa_free2_cb_t The previous patch removed module-gconf's dependency on the userdata pointer of the free callback, and that was the only place where the userdata pointer of pa_free2_cb_t was used, so now there's no need for pa_free2_cb_t in pa_hashmap_free(). Using pa_free_cb_t instead allows removing a significant amount of repetitive code. --- src/modules/module-augment-properties.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src/modules/module-augment-properties.c') diff --git a/src/modules/module-augment-properties.c b/src/modules/module-augment-properties.c index 6bba2b301..ee3b54c78 100644 --- a/src/modules/module-augment-properties.c +++ b/src/modules/module-augment-properties.c @@ -347,14 +347,8 @@ void pa__done(pa_module *m) { if (u->client_proplist_changed_slot) pa_hook_slot_free(u->client_proplist_changed_slot); - if (u->cache) { - struct rule *r; - - while ((r = pa_hashmap_steal_first(u->cache))) - rule_free(r); - - pa_hashmap_free(u->cache, NULL, NULL); - } + if (u->cache) + pa_hashmap_free(u->cache, (pa_free_cb_t) rule_free); pa_xfree(u); } -- cgit v1.2.1