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

lxclock: cleanup lxc_putlock()

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

diff --git a/src/lxc/lxclock.c b/src/lxc/lxclock.c
index a08f56985..650a083d6 100644
--- a/src/lxc/lxclock.c
+++ b/src/lxc/lxclock.c
@@ -264,24 +264,16 @@ void lxc_putlock(struct lxc_lock *l)
 	if (!l)
 		return;
 
-	switch(l->type) {
+	switch (l->type) {
 	case LXC_LOCK_ANON_SEM:
 		if (l->u.sem) {
 			sem_destroy(l->u.sem);
-			free(l->u.sem);
-			l->u.sem = NULL;
+			free_disarm(l->u.sem);
 		}
-
 		break;
 	case LXC_LOCK_FLOCK:
-		if (l->u.f.fd >= 0) {
-			close(l->u.f.fd);
-			l->u.f.fd = -1;
-		}
-
-		free(l->u.f.fname);
-		l->u.f.fname = NULL;
-
+		close_prot_errno_disarm(l->u.f.fd);
+		free_disarm(l->u.f.fname);
 		break;
 	}