tests: Fix uninitialised-use-of-'ret' warning
authorDaniel Stone <daniel@fooishbar.org>
Fri, 3 Aug 2012 00:37:09 +0000 (02:37 +0200)
committerDaniel Stone <daniel@fooishbar.org>
Wed, 8 Aug 2012 11:30:24 +0000 (13:30 +0200)
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
test/interactive.c

index 2941c42..6bd6a4f 100644 (file)
@@ -470,11 +470,13 @@ main(int argc, char *argv[])
         if (!file) {
             fprintf(stderr, "Couldn't open file %s: %s\n",
                     keymap_path, strerror(errno));
+            ret = -1;
             goto err_ctx;
         }
         keymap = xkb_map_new_from_file(ctx, file,
                                        XKB_KEYMAP_FORMAT_TEXT_V1, 0);
-    } else {
+    }
+    else {
         keymap = xkb_map_new_from_names(ctx, &names, 0);
     }
     if (!keymap) {
@@ -499,9 +501,8 @@ main(int argc, char *argv[])
     system("stty -echo");
 
     ret = loop(kbds);
-    if (ret) {
+    if (ret)
         goto err_stty;
-    }
 
 err_stty:
     system("stty echo");