chiark / gitweb /
Replace free and return NULL with return mfree
authorDaniel Lockyer <thisisdaniellockyer@gmail.com>
Fri, 24 Nov 2017 10:31:49 +0000 (10:31 +0000)
committerSven Eden <yamakuzure@gmx.net>
Fri, 24 Nov 2017 10:31:49 +0000 (10:31 +0000)
src/basic/khash.c
src/libelogind/sd-bus/bus-objects.c

index 84648dc1c9463debfeca1e1d8cff9e1e3f9ff4be..2e89c2cb3dd883d3279ea9544274357b850d1849 100644 (file)
@@ -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) {
index e72bd19206afe9f2c50d6b9c38f41baef04c7926..df4b96910183306a79454fcefc38f1e982dd8edc 100644 (file)
@@ -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)