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

conf: cleanup macros setup_sysctl_parameters

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

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index a478d06ec..d1537243b 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -2632,10 +2632,10 @@ int setup_resource_limits(struct lxc_list *limits, pid_t pid)
 
 int setup_sysctl_parameters(struct lxc_list *sysctls)
 {
+	__do_free char *tmp = NULL;
 	struct lxc_list *it;
 	struct lxc_sysctl *elem;
 	int ret = 0;
-	char *tmp = NULL;
 	char filename[PATH_MAX] = {0};
 
 	lxc_list_for_each (it, sysctls) {
@@ -2647,7 +2647,6 @@ int setup_sysctl_parameters(struct lxc_list *sysctls)
 		}
 
 		ret = snprintf(filename, sizeof(filename), "/proc/sys/%s", tmp);
-		free(tmp);
 		if (ret < 0 || (size_t)ret >= sizeof(filename)) {
 			ERROR("Error setting up sysctl parameters path");
 			return -1;