tree-wide: convert some more mfree() candidates

This commit is contained in:
Daniel Mack 2015-08-03 19:26:07 +02:00
parent 9317cbecf8
commit 0da1624818
2 changed files with 4 additions and 8 deletions

View File

@ -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)

View File

@ -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)