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

merge r2192 from prepare-0.9.10

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2207 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2008-03-31 22:11:06 +00:00
parent 70a459ba69
commit 9f71611ab0
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/pulsecore/hashmap.c
View file

@ -71,7 +71,7 @@ pa_hashmap *pa_hashmap_new(pa_hash_func_t hash_func, pa_compare_func_t compare_f
return h; return h;
} }
static void remove(pa_hashmap *h, struct hashmap_entry *e) { static void remove_entry(pa_hashmap *h, struct hashmap_entry *e) {
pa_assert(h); pa_assert(h);
pa_assert(e); pa_assert(e);
@ -103,7 +103,7 @@ void pa_hashmap_free(pa_hashmap*h, void (*free_func)(void *p, void *userdata), v
while (h->first_entry) { while (h->first_entry) {
if (free_func) if (free_func)
free_func(h->first_entry->value, userdata); free_func(h->first_entry->value, userdata);
remove(h, h->first_entry); remove_entry(h, h->first_entry);
} }
pa_xfree(h->data); pa_xfree(h->data);
@ -182,7 +182,7 @@ void* pa_hashmap_remove(pa_hashmap *h, const void *key) {
return NULL; return NULL;
data = e->value; data = e->value;
remove(h, e); remove_entry(h, e);
return data; return data;
} }
@ -220,7 +220,7 @@ void* pa_hashmap_steal_first(pa_hashmap *h) {
return NULL; return NULL;
data = h->first_entry->value; data = h->first_entry->value;
remove(h, h->first_entry); remove_entry(h, h->first_entry);
return data; return data;
} }