Always call XCloseDisplay()

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

diff --git a/src/xinput.c b/src/xinput.c
index a336f53b61c9ef223f0860b46d570515ba48ce95..a1bb221a927662c9d9fd6a45094a3c3861f0c9bb 100644 (file)
--- 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");
 
     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");
     }
 
     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);
     }
 
     if (!xinput_version(display)) {
        fprintf(stderr, "%s extension not available\n", INAME);

-       return EXIT_FAILURE;
+       goto out;

     }
 
     while(driver->func_name) {
     }
 
     while(driver->func_name) {


@@ -394,6 +394,9 @@ main(int argc, char * argv[])
 
     usage();
 
 
     usage();
 

+out:
+    if (display)
+        XCloseDisplay(display);

     return EXIT_FAILURE;
 }
 
     return EXIT_FAILURE;
 }