[pulseaudio-commits] r2207 - /trunk/src/pulsecore/hashmap.c

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Tue Apr  1 00:11:06 2008
New Revision: 2207

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=2207&root=pulseaudio&view=rev
Log:
merge r2192 from prepare-0.9.10

Modified:
    trunk/src/pulsecore/hashmap.c

Modified: trunk/src/pulsecore/hashmap.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/hashmap.c?rev=2207&root=pulseaudio&r1=2206&r2=2207&view=diff
==============================================================================
--- trunk/src/pulsecore/hashmap.c (original)
+++ trunk/src/pulsecore/hashmap.c Tue Apr  1 00:11:06 2008
@@ -71,7 +71,7 @@
     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 @@
     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 @@
         return NULL;
 
     data = e->value;
-    remove(h, e);
+    remove_entry(h, e);
     return data;
 }
 
@@ -220,7 +220,7 @@
         return NULL;
 
     data = h->first_entry->value;
-    remove(h, h->first_entry);
+    remove_entry(h, h->first_entry);
     return data;
 }