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

hashmap: Add pa_hashmap_remove_and_free()

Browse source
This commit is contained in:
Tanu Kaskinen 2014-03-26 17:39:47 +02:00
parent 36f775482f
commit 14e2553185
2 changed files with 20 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/pulsecore/hashmap.c
View file

@ -207,6 +207,19 @@ void* pa_hashmap_remove(pa_hashmap *h, const void *key) {
return data; return data;
} }
int pa_hashmap_remove_and_free(pa_hashmap *h, const void *key) {
void *data;
pa_assert(h);
data = pa_hashmap_remove(h, key);
if (data && h->value_free_func)
h->value_free_func(data);
return data ? 0 : -1;
}
void pa_hashmap_remove_all(pa_hashmap *h) { void pa_hashmap_remove_all(pa_hashmap *h) {
pa_assert(h); pa_assert(h);

7
src/pulsecore/hashmap.h
View file

@ -52,6 +52,13 @@ void* pa_hashmap_get(pa_hashmap *h, const void *key);
/* Returns the data of the entry while removing */ /* Returns the data of the entry while removing */
void* pa_hashmap_remove(pa_hashmap *h, const void *key); void* pa_hashmap_remove(pa_hashmap *h, const void *key);
/* Removes the entry and frees the entry data. Returns a negative value if the
* entry is not found. FIXME: This function shouldn't be needed.
* pa_hashmap_remove() should free the entry data, and the current semantics of
* pa_hashmap_remove() should be implemented by a function called
* pa_hashmap_steal(). */
int pa_hashmap_remove_and_free(pa_hashmap *h, const void *key);
/* Remove all entries but don't free the hashmap */ /* Remove all entries but don't free the hashmap */
void pa_hashmap_remove_all(pa_hashmap *h); void pa_hashmap_remove_all(pa_hashmap *h);