From 5fecf46d76b31eedb3132cd569cfb82295e132bc Mon Sep 17 00:00:00 2001
From: Daniel Lockyer <thisisdaniellockyer@gmail.com>
Date: Fri, 24 Nov 2017 10:31:49 +0000
Subject: Replace free and return NULL with return mfree

---
 src/libudev/libudev-hwdb.c    | 3 +--
 src/libudev/libudev-monitor.c | 3 +--
 src/libudev/libudev-queue.c   | 3 +--
 src/libudev/libudev.c         | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'src/libudev')

diff --git a/src/libudev/libudev-hwdb.c b/src/libudev/libudev-hwdb.c
index 5edb0bea7e..d2665278c1 100644
--- a/src/libudev/libudev-hwdb.c
+++ b/src/libudev/libudev-hwdb.c
@@ -113,8 +113,7 @@ _public_ struct udev_hwdb *udev_hwdb_unref(struct udev_hwdb *hwdb) {
                 return NULL;
         sd_hwdb_unref(hwdb->hwdb);
         udev_list_cleanup(&hwdb->properties_list);
-        free(hwdb);
-        return NULL;
+        return mfree(hwdb);
 }
 
 /**
diff --git a/src/libudev/libudev-monitor.c b/src/libudev/libudev-monitor.c
index 3c9f1f9496..ca14373e19 100644
--- a/src/libudev/libudev-monitor.c
+++ b/src/libudev/libudev-monitor.c
@@ -493,8 +493,7 @@ _public_ struct udev_monitor *udev_monitor_unref(struct udev_monitor *udev_monit
                 close(udev_monitor->sock);
         udev_list_cleanup(&udev_monitor->filter_subsystem_list);
         udev_list_cleanup(&udev_monitor->filter_tag_list);
-        free(udev_monitor);
-        return NULL;
+        return mfree(udev_monitor);
 }
 
 /**
diff --git a/src/libudev/libudev-queue.c b/src/libudev/libudev-queue.c
index b1e41c086d..b941afb773 100644
--- a/src/libudev/libudev-queue.c
+++ b/src/libudev/libudev-queue.c
@@ -115,8 +115,7 @@ _public_ struct udev_queue *udev_queue_unref(struct udev_queue *udev_queue)
 
         safe_close(udev_queue->fd);
 
-        free(udev_queue);
-        return NULL;
+        return mfree(udev_queue);
 }
 
 /**
diff --git a/src/libudev/libudev.c b/src/libudev/libudev.c
index 475b94f913..64904c5ffa 100644
--- a/src/libudev/libudev.c
+++ b/src/libudev/libudev.c
@@ -136,8 +136,7 @@ _public_ struct udev *udev_unref(struct udev *udev) {
         udev->refcount--;
         if (udev->refcount > 0)
                 return udev;
-        free(udev);
-        return NULL;
+        return mfree(udev);
 }
 
 /**
-- 
cgit v1.2.1