summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Lockyer <thisisdaniellockyer@gmail.com>2017-11-24 10:31:49 +0000
committerSven Eden <yamakuzure@gmx.net>2017-11-24 10:31:49 +0000
commit7638de02c66265741bb64037d04f7f53759a564c (patch)
tree6365c41dc247dee517dcfdb241b1ad5f1f68f51c /src
parentb24ecf1c0d83bc5493d96e804bf356ed9b624fcd (diff)
Replace free and return NULL with return mfree
Diffstat (limited to 'src')
-rw-r--r--src/basic/khash.c4
-rw-r--r--src/libelogind/sd-bus/bus-objects.c3
2 files changed, 2 insertions, 5 deletions
diff --git a/src/basic/khash.c b/src/basic/khash.c
index 84648dc1c..2e89c2cb3 100644
--- a/src/basic/khash.c
+++ b/src/basic/khash.c
@@ -126,9 +126,7 @@ khash* khash_unref(khash *h) {
safe_close(h->fd);
free(h->algorithm);
- free(h);
-
- return NULL;
+ return mfree(h);
}
int khash_dup(khash *h, khash **ret) {
diff --git a/src/libelogind/sd-bus/bus-objects.c b/src/libelogind/sd-bus/bus-objects.c
index e72bd1920..df4b96910 100644
--- a/src/libelogind/sd-bus/bus-objects.c
+++ b/src/libelogind/sd-bus/bus-objects.c
@@ -1475,8 +1475,7 @@ static struct node *bus_node_allocate(sd_bus *bus, const char *path) {
r = hashmap_put(bus->nodes, n->path, n);
if (r < 0) {
free(n->path);
- free(n);
- return NULL;
+ return mfree(n);
}
if (parent)