From: Daniel Mack <daniel@zonque.org>
Date: Mon, 3 Aug 2015 17:26:07 +0000 (+0200)
Subject: tree-wide: convert some more mfree() candidates
X-Git-Tag: v225~123
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0da162481886c6ded6fac514cb1e3da1c9845771;p=thirdparty%2Fsystemd.git

tree-wide: convert some more mfree() candidates
---

diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index 34a30605092..6b3162a35fc 100644
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -826,14 +826,12 @@ int cg_install_release_agent(const char *controller, const char *agent) {
         } else if (!streq(sc, agent))
                 return -EEXIST;
 
-        free(fs);
-        fs = NULL;
+        fs = mfree(fs);
         r = cg_get_path(controller, NULL, "notify_on_release", &fs);
         if (r < 0)
                 return r;
 
-        free(contents);
-        contents = NULL;
+        contents = mfree(contents);
         r = read_one_line_file(fs, &contents);
         if (r < 0)
                 return r;
@@ -865,8 +863,7 @@ int cg_uninstall_release_agent(const char *controller) {
         if (r < 0)
                 return r;
 
-        free(fs);
-        fs = NULL;
+        fs = mfree(fs);
 
         r = cg_get_path(controller, NULL, "release_agent", &fs);
         if (r < 0)
diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
index 05f1ae2646d..c526a85b056 100644
--- a/src/firstboot/firstboot.c
+++ b/src/firstboot/firstboot.c
@@ -763,8 +763,7 @@ static int parse_argv(int argc, char *argv[]) {
                         break;
 
                 case ARG_ROOT_PASSWORD_FILE:
-                        free(arg_root_password);
-                        arg_root_password  = NULL;
+                        arg_root_password = mfree(arg_root_password);
 
                         r = read_one_line_file(optarg, &arg_root_password);
                         if (r < 0)