summaryrefslogtreecommitdiff
path: root/src/pulse/proplist.c
diff options
context:
space:
mode:
authorTanu Kaskinen <tanuk@iki.fi>2013-02-12 21:36:53 +0200
committerTanu Kaskinen <tanuk@iki.fi>2013-02-16 01:12:21 +0200
commit8872c238ba6748c76455ecc6827b83ebcb1dd469 (patch)
tree1f73094f08088d08ded489f479cbf54ab7769214 /src/pulse/proplist.c
parentdcf043842e6bef0680bb246e7266b7c0829d34d4 (diff)
downloadpulseaudio-8872c238ba6748c76455ecc6827b83ebcb1dd469.tar.gz
hashmap: Use pa_free_cb_t instead of pa_free2_cb_t
The previous patch removed module-gconf's dependency on the userdata pointer of the free callback, and that was the only place where the userdata pointer of pa_free2_cb_t was used, so now there's no need for pa_free2_cb_t in pa_hashmap_free(). Using pa_free_cb_t instead allows removing a significant amount of repetitive code.
Diffstat (limited to 'src/pulse/proplist.c')
-rw-r--r--src/pulse/proplist.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/pulse/proplist.c b/src/pulse/proplist.c
index 2c197bccc..33b150c40 100644
--- a/src/pulse/proplist.c
+++ b/src/pulse/proplist.c
@@ -70,8 +70,7 @@ pa_proplist* pa_proplist_new(void) {
void pa_proplist_free(pa_proplist* p) {
pa_assert(p);
- pa_proplist_clear(p);
- pa_hashmap_free(MAKE_HASHMAP(p), NULL, NULL);
+ pa_hashmap_free(MAKE_HASHMAP(p), (pa_free_cb_t) property_free);
}
/** Will accept only valid UTF-8 */