From a1e58e8ee1c84b633d6d6d651d5328d4dd4eba5b Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 8 Sep 2015 18:43:11 +0200
Subject: tree-wide: use coccinelle to patch a lot of code to use mfree()

This replaces this:

        free(p);
        p = NULL;

by this:

        p = mfree(p);

Change generated using coccinelle. Semantic patch is added to the
sources.
---
 src/basic/bitmap.c        | 3 +--
 src/basic/lockfile-util.c | 3 +--
 src/basic/strv.c          | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'src/basic')

diff --git a/src/basic/bitmap.c b/src/basic/bitmap.c
index 7ea3357031..2eabf3e1c1 100644
--- a/src/basic/bitmap.c
+++ b/src/basic/bitmap.c
@@ -145,8 +145,7 @@ bool bitmap_isclear(Bitmap *b) {
 void bitmap_clear(Bitmap *b) {
         assert(b);
 
-        free(b->bitmaps);
-        b->bitmaps = NULL;
+        b->bitmaps = mfree(b->bitmaps);
         b->n_bitmaps = 0;
         b->bitmaps_allocated = 0;
 }
diff --git a/src/basic/lockfile-util.c b/src/basic/lockfile-util.c
index 05e16d1caa..f3ec6a3e52 100644
--- a/src/basic/lockfile-util.c
+++ b/src/basic/lockfile-util.c
@@ -145,8 +145,7 @@ void release_lock_file(LockFile *f) {
                 if ((f->operation & ~LOCK_NB) == LOCK_EX)
                         unlink_noerrno(f->path);
 
-                free(f->path);
-                f->path = NULL;
+                f->path = mfree(f->path);
         }
 
         f->fd = safe_close(f->fd);
diff --git a/src/basic/strv.c b/src/basic/strv.c
index eaf440a4b2..aa68d290f6 100644
--- a/src/basic/strv.c
+++ b/src/basic/strv.c
@@ -271,8 +271,7 @@ char **strv_split_newlines(const char *s) {
                 return l;
 
         if (isempty(l[n-1])) {
-                free(l[n-1]);
-                l[n-1] = NULL;
+                l[n - 1] = mfree(l[n - 1]);
         }
 
         return l;
-- 
cgit v1.2.3-54-g00ecf