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 a1361be40f08ab03875db0b69227432e4667b788..019dbe80b7f856506a13cbf01057591c86faf22c 100644 (file)
--- 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)