From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 17 Feb 2012 03:19:42 +0000 (+1000)
Subject: Always call XCloseDisplay()
X-Git-Url: https://diplodocus.org/git/xorg-xinput/commitdiff_plain/e1686fdbb8729f9f639ecab6860690103bb25db1?ds=sidebyside;hp=-c

Always call XCloseDisplay()

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
---

e1686fdbb8729f9f639ecab6860690103bb25db1
diff --git a/src/xinput.c b/src/xinput.c
index a336f53..a1bb221 100644
--- a/src/xinput.c
+++ b/src/xinput.c
@@ -368,17 +368,17 @@ main(int argc, char * argv[])
 
     if (display == NULL) {
 	fprintf(stderr, "Unable to connect to X server\n");
-	return EXIT_FAILURE;
+	goto out;
     }
 
     if (!XQueryExtension(display, "XInputExtension", &xi_opcode, &event, &error)) {
         printf("X Input extension not available.\n");
-        return EXIT_FAILURE;
+        goto out;
     }
 
     if (!xinput_version(display)) {
 	fprintf(stderr, "%s extension not available\n", INAME);
-	return EXIT_FAILURE;
+	goto out;
     }
 
     while(driver->func_name) {
@@ -394,6 +394,9 @@ main(int argc, char * argv[])
 
     usage();
 
+out:
+    if (display)
+        XCloseDisplay(display);
     return EXIT_FAILURE;
 }