From: Quentin Rameau <quinq@fifth.space>
Date: Thu, 1 Sep 2016 11:46:19 +0000 (+0200)
Subject: Add cleanup() to do free(locks) + XCloseDisplay()
X-Git-Url: https://git.danieliu.xyz/?a=commitdiff_plain;h=1f66885fbf36c726b7615060d3c98cbf74218d13;p=slock.git

Add cleanup() to do free(locks) + XCloseDisplay()
---

diff --git a/slock.c b/slock.c
index 9ec2f71..4980325 100644
--- a/slock.c
+++ b/slock.c
@@ -230,6 +230,13 @@ unlockscreen(Display *dpy, Lock *lock)
 	free(lock);
 }
 
+static void
+cleanup(Display *dpy)
+{
+	free(locks);
+	XCloseDisplay(dpy);
+}
+
 static Lock *
 lockscreen(Display *dpy, int screen)
 {
@@ -349,8 +356,7 @@ main(int argc, char **argv) {
 	/* did we actually manage to lock anything? */
 	if (nlocks == 0) {
 		/* nothing to protect */
-		free(locks);
-		XCloseDisplay(dpy);
+		cleanup(dpy);
 		return 1;
 	}
 
@@ -358,8 +364,7 @@ main(int argc, char **argv) {
 	if (argc > 0) {
 		switch (fork()) {
 		case -1:
-			free(locks);
-			XCloseDisplay(dpy);
+			cleanup(dpy);
 			die("slock: fork failed: %s\n", strerror(errno));
 		case 0:
 			if (close(ConnectionNumber(dpy)) < 0)
@@ -382,8 +387,7 @@ main(int argc, char **argv) {
 	for (s = 0; s < nscreens; s++)
 		unlockscreen(dpy, locks[s]);
 
-	free(locks);
-	XCloseDisplay(dpy);
+	cleanup(dpy);
 
 	return 0;
 }