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

conf: cleanup macros mount_entry_on_generic

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

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 0ef7d4b1b..a478d06ec 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -2187,9 +2187,9 @@ static inline int mount_entry_on_generic(struct mntent *mntent,
 					 const char *lxc_name,
 					 const char *lxc_path)
 {
+	__do_free char *mntdata = NULL;
 	int ret;
 	unsigned long mntflags;
-	char *mntdata;
 	bool dev, optional, relative;
 	unsigned long pflags = 0;
 	char *rootfs_path = NULL;
@@ -2222,7 +2222,6 @@ static inline int mount_entry_on_generic(struct mntent *mntent,
 	ret = mount_entry(mntent->mnt_fsname, path, mntent->mnt_type, mntflags,
 			  pflags, mntdata, optional, dev, relative, rootfs_path);
 
-	free(mntdata);
 	return ret;
 }