diff options
| author | Daniel Mack <daniel@zonque.org> | 2015-08-03 19:26:07 +0200 |
|---|---|---|
| committer | Daniel Mack <daniel@zonque.org> | 2015-08-03 19:39:42 +0200 |
| commit | 0da162481886c6ded6fac514cb1e3da1c9845771 (patch) | |
| tree | e44f2c36d7c43bf0191ccb99875726cd9f93a4f6 /src | |
| parent | 9317cbecf8b06295cd67a3db2f91a8d60788ea24 (diff) | |
tree-wide: convert some more mfree() candidates
Diffstat (limited to 'src')
| -rw-r--r-- | src/basic/cgroup-util.c | 9 | ||||
| -rw-r--r-- | src/firstboot/firstboot.c | 3 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c index 34a3060509..6b3162a35f 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 05f1ae2646..c526a85b05 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) |