From e1686fdbb8729f9f639ecab6860690103bb25db1 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 17 Feb 2012 13:19:42 +1000 Subject: [PATCH] Always call XCloseDisplay() Signed-off-by: Peter Hutterer Reviewed-by: Chase Douglas --- src/xinput.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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; } -- 2.56.0