Merge pull request #814 from dvdhrm/mfree

tree-wide: introduce mfree()

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