summaryrefslogtreecommitdiff
path: root/src/nspawn
diff options
context:
space:
mode:
authorDaniel Mack <github@zonque.org>2015-07-31 20:17:33 +0200
committerDaniel Mack <github@zonque.org>2015-07-31 20:17:33 +0200
commit6f7897f9d2bd5ec7d6a9be8ad700661bb17a21cf (patch)
treef03d3e452e8433c350616f6ffc7d28b08bd23335 /src/nspawn
parent97d09a62836e1c6f807837cf47e83c970cecb06b (diff)
parent97b11eedff9d2e17101ad453caf9e48b73246719 (diff)
Merge pull request #814 from dvdhrm/mfree
tree-wide: introduce mfree()
Diffstat (limited to 'src/nspawn')
-rw-r--r--src/nspawn/nspawn.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index d46f768cfa..e78b15a8b3 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -309,8 +309,7 @@ static void custom_mount_free_all(void) {
strv_free(m->lower);
}
- free(arg_custom_mounts);
- arg_custom_mounts = NULL;
+ arg_custom_mounts = mfree(arg_custom_mounts);
arg_n_custom_mounts = 0;
}
@@ -561,8 +560,7 @@ static int parse_argv(int argc, char *argv[]) {
case 'M':
if (isempty(optarg)) {
- free(arg_machine);
- arg_machine = NULL;
+ arg_machine = mfree(arg_machine);
} else {
if (!machine_name_is_valid(optarg)) {
log_error("Invalid machine name: %s", optarg);