From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Wed, 9 Dec 2020 10:18:10 +0000 (+0100)
Subject: lxclock: cleanup lxclock_name()
X-Git-Tag: lxc-5.0.0~330^2~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82c1fd646a79967c02f605b5525bf893a8d9b114;p=thirdparty%2Flxc.git

lxclock: cleanup lxclock_name()

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

diff --git a/src/lxc/lxclock.c b/src/lxc/lxclock.c
index a1361be40..019dbe80b 100644
--- a/src/lxc/lxclock.c
+++ b/src/lxc/lxclock.c
@@ -101,10 +101,8 @@ static char *lxclock_name(const char *p, const char *n)
 	len += strlen(rundir);
 
 	dest = malloc(len);
-	if (!dest) {
-		free(rundir);
+	if (!dest)
 		return NULL;
-	}
 
 	ret = snprintf(dest, len, "%s/lxc/lock/%s", rundir, p);
 	if (ret < 0 || (size_t)ret >= len) {
@@ -132,20 +130,18 @@ static char *lxclock_name(const char *p, const char *n)
 
 static sem_t *lxc_new_unnamed_sem(void)
 {
+	__do_free sem_t *s = NULL;
 	int ret;
-	sem_t *s;
 
 	s = malloc(sizeof(*s));
 	if (!s)
-		return NULL;
+		return ret_set_errno(NULL, ENOMEM);
 
 	ret = sem_init(s, 0, 1);
-	if (ret < 0) {
-		free(s);
+	if (ret < 0)
 		return NULL;
-	}
 
-	return s;
+	return move_ptr(s);
 }
 
 struct lxc_lock *lxc_newlock(const char *lxcpath, const char *name)