Use pa_hashmap_remove_and_free() where appropriate

[pulseaudio] / src / pulsecore / database-simple.c

diff --git a/src/pulsecore/database-simple.c b/src/pulsecore/database-simple.c
index 562c9ab652835e88f7610a3ac1b3a611f1b2f9f6..155a5fa2366551ce9ead7ed265ee5776f3329dfb 100644 (file)
--- a/src/pulsecore/database-simple.c
+++ b/src/pulsecore/database-simple.c
@@ -322,18 +322,11 @@ int pa_database_set(pa_database *database, const pa_datum *key, const pa_datum*
 
 int pa_database_unset(pa_database *database, const pa_datum *key) {
     simple_data *db = (simple_data*)database;
-    entry *e;
 
     pa_assert(db);
     pa_assert(key);
 
-    e = pa_hashmap_remove(db->map, key);
-    if (!e)
-        return -1;
-
-    free_entry(e);
-
-    return 0;
+    return pa_hashmap_remove_and_free(db->map, key);
 }
 
 int pa_database_clear(pa_database *database) {