summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2008-03-31 22:11:06 +0000
committerLennart Poettering <lennart@poettering.net>2008-03-31 22:11:06 +0000
commit9f71611ab0880994f8f23234084d1e10b17b314a (patch)
treef9fc8cc4776014e65b66aac285d2129bd71c674d
parent70a459ba6964042e3da4532e264699e2fb6c730a (diff)
merge r2192 from prepare-0.9.10
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2207 fefdeb5f-60dc-0310-8127-8f9354f1896f
-rw-r--r--src/pulsecore/hashmap.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/pulsecore/hashmap.c b/src/pulsecore/hashmap.c
index f5589664..c9d5632c 100644
--- a/src/pulsecore/hashmap.c
+++ b/src/pulsecore/hashmap.c
@@ -71,7 +71,7 @@ pa_hashmap *pa_hashmap_new(pa_hash_func_t hash_func, pa_compare_func_t compare_f
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(e);
@@ -103,7 +103,7 @@ void pa_hashmap_free(pa_hashmap*h, void (*free_func)(void *p, void *userdata), v
while (h->first_entry) {
if (free_func)
free_func(h->first_entry->value, userdata);
- remove(h, h->first_entry);
+ remove_entry(h, h->first_entry);
}
pa_xfree(h->data);
@@ -182,7 +182,7 @@ void* pa_hashmap_remove(pa_hashmap *h, const void *key) {
return NULL;
data = e->value;
- remove(h, e);
+ remove_entry(h, e);
return data;
}
@@ -220,7 +220,7 @@ void* pa_hashmap_steal_first(pa_hashmap *h) {
return NULL;
data = h->first_entry->value;
- remove(h, h->first_entry);
+ remove_entry(h, h->first_entry);
return data;
}