mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-03 09:01:50 -05:00
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:
parent
dcf043842e
commit
8872c238ba
41 changed files with 112 additions and 308 deletions
|
|
@ -817,14 +817,8 @@ void pa__done(pa_module *m) {
|
|||
if (u->inotify_fd >= 0)
|
||||
pa_close(u->inotify_fd);
|
||||
|
||||
if (u->devices) {
|
||||
struct device *d;
|
||||
|
||||
while ((d = pa_hashmap_steal_first(u->devices)))
|
||||
device_free(d);
|
||||
|
||||
pa_hashmap_free(u->devices, NULL, NULL);
|
||||
}
|
||||
if (u->devices)
|
||||
pa_hashmap_free(u->devices, (pa_free_cb_t) device_free);
|
||||
|
||||
pa_xfree(u);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue