summaryrefslogtreecommitdiff
path: root/src/pulsecore/database-simple.c
diff options
context:
space:
mode:
authorTanu Kaskinen <tanu.kaskinen@linux.intel.com>2014-03-26 17:39:48 +0200
committerTanu Kaskinen <tanu.kaskinen@linux.intel.com>2014-04-17 10:06:23 +0300
commiteca082a93f2619cfa10733947a81fa779cb49573 (patch)
treee97621d7180832fb493c219a3db044a25c11a89b /src/pulsecore/database-simple.c
parent14e2553185e1afa93737586771326cd12a154239 (diff)
Use pa_hashmap_remove_and_free() where appropriate
Diffstat (limited to 'src/pulsecore/database-simple.c')
-rw-r--r--src/pulsecore/database-simple.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/pulsecore/database-simple.c b/src/pulsecore/database-simple.c
index 562c9ab65..155a5fa23 100644
--- 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) {