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

Use pa_hashmap_remove_and_free() where appropriate

Browse source
This commit is contained in:
Tanu Kaskinen 2014-03-26 17:39:48 +02:00
parent 14e2553185
commit eca082a93f
14 changed files with 29 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/modules/alsa/alsa-mixer.c
View file

@ -4296,10 +4296,8 @@ static void paths_drop_unused(pa_hashmap* h, pa_hashmap *keep) {
p = pa_hashmap_iterate(h, &state, &key);
while (p) {
if (pa_hashmap_get(keep, p) == NULL) {
pa_hashmap_remove(h, key);
pa_alsa_path_free(p);
}
if (pa_hashmap_get(keep, p) == NULL)
pa_hashmap_remove_and_free(h, key);
p = pa_hashmap_iterate(h, &state, &key);
}
}
@ -4468,17 +4466,13 @@ void pa_alsa_profile_set_drop_unsupported(pa_alsa_profile_set *ps) {
void *state;
PA_HASHMAP_FOREACH(p, ps->profiles, state) {
if (!p->supported) {
pa_hashmap_remove(ps->profiles, p->name);
profile_free(p);
}
if (!p->supported)
pa_hashmap_remove_and_free(ps->profiles, p->name);
}
PA_HASHMAP_FOREACH(m, ps->mappings, state) {
if (m->supported <= 0) {
pa_hashmap_remove(ps->mappings, m->name);
mapping_free(m);
}
if (m->supported <= 0)
pa_hashmap_remove_and_free(ps->mappings, m->name);
}
}