From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Tue, 19 Feb 2019 22:42:45 +0000 (+0100)
Subject: conf: cleanup macros pin_rootfs
X-Git-Tag: lxc-3.2.0~132^2~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=957c470438fa5b59b6481205242d216094813b7a;p=thirdparty%2Flxc.git

conf: cleanup macros pin_rootfs

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index d52c79f69..d7ae64cef 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -536,9 +536,9 @@ int run_script(const char *name, const char *section, const char *script, ...)
  */
 int pin_rootfs(const char *rootfs)
 {
+	__do_free char *absrootfs = NULL;
 	int fd, ret;
 	char absrootfspin[PATH_MAX];
-	char *absrootfs;
 	struct stat s;
 	struct statfs sfs;
 
@@ -550,18 +550,13 @@ int pin_rootfs(const char *rootfs)
 		return -2;
 
 	ret = stat(absrootfs, &s);
-	if (ret < 0) {
-		free(absrootfs);
+	if (ret < 0)
 		return -1;
-	}
 
-	if (!S_ISDIR(s.st_mode)) {
-		free(absrootfs);
+	if (!S_ISDIR(s.st_mode))
 		return -2;
-	}
 
 	ret = snprintf(absrootfspin, PATH_MAX, "%s/.lxc-keep", absrootfs);
-	free(absrootfs);
 	if (ret < 0 || ret >= PATH_MAX)
 		return -1;