mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-04 13:29:59 -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
|
|
@ -347,19 +347,14 @@ fail:
|
|||
|
||||
void pa__done(pa_module *m) {
|
||||
struct userdata *u;
|
||||
struct session *session;
|
||||
|
||||
pa_assert(m);
|
||||
|
||||
if (!(u = m->userdata))
|
||||
return;
|
||||
|
||||
if (u->sessions) {
|
||||
while ((session = pa_hashmap_steal_first(u->sessions)))
|
||||
free_session(session);
|
||||
|
||||
pa_hashmap_free(u->sessions, NULL, NULL);
|
||||
}
|
||||
if (u->sessions)
|
||||
pa_hashmap_free(u->sessions, (pa_free_cb_t) free_session);
|
||||
|
||||
if (u->connection) {
|
||||
pa_dbus_remove_matches(
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue