From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sun, 16 Sep 2012 13:09:47 +0000 (+0200)
Subject: nspawn: use automatic cleanup
X-Git-Tag: v190~73
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=6b2d0e85dce8762d6d65a97c7c7ae5e81806fe3e

nspawn: use automatic cleanup

This one actually clears up a (totally harmless) memleak.
---

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 770019bb8..c46f63ba2 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -46,6 +46,7 @@
 #include "log.h"
 #include "util.h"
 #include "mkdir.h"
+#include "macro.h"
 #include "audit.h"
 #include "missing.h"
 #include "cgroup-util.h"
@@ -283,7 +284,7 @@ static int mount_all(const char *dest) {
 
         unsigned k;
         int r = 0;
-        char *where;
+        char _cleanup_free_ *where = NULL;
 
         for (k = 0; k < ELEMENTSOF(mount_table); k++) {
                 int t;
@@ -300,7 +301,6 @@ static int mount_all(const char *dest) {
                 t = path_is_mount_point(where, true);
                 if (t < 0) {
                         log_error("Failed to detect whether %s is a mount point: %s", where, strerror(-t));
-                        free(where);
 
                         if (r == 0)
                                 r = t;
@@ -326,8 +326,6 @@ static int mount_all(const char *dest) {
                         if (r == 0)
                                 r = -errno;
                 }
-
-                free(where);
         }
 
         return r;