From: Daniel Lockyer <thisisdaniellockyer@gmail.com>
Date: Fri, 24 Nov 2017 10:31:49 +0000 (+0000)
Subject: Replace free and return NULL with return mfree
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=7638de02c66265741bb64037d04f7f53759a564c;p=elogind.git

Replace free and return NULL with return mfree
---

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)