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.
This commit is contained in:
Tanu Kaskinen 2013-02-12 21:36:53 +02:00
parent dcf043842e
commit 8872c238ba
41 changed files with 112 additions and 308 deletions

View file

@ -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);
}