summaryrefslogtreecommitdiff
path: root/tools/how-to-type.c
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2020-07-09 12:15:45 +1000
committerRan Benita <ran@unusedvar.com>2020-07-25 11:05:14 +0300
commit714182066d086baf848c22258136c8dd94a4edca (patch)
treefddfd36b275ca9a6ed3914854ea42cc3294f1ee9 /tools/how-to-type.c
parent29e80e7b7608961a9400eaa10880c4a25e5e3726 (diff)
downloadxorg-lib-libxkbcommon-714182066d086baf848c22258136c8dd94a4edca.tar.gz
tools: consistently return 2 on invalid usage
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'tools/how-to-type.c')
-rw-r--r--tools/how-to-type.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/tools/how-to-type.c b/tools/how-to-type.c
index 6fef401..441db38 100644
--- a/tools/how-to-type.c
+++ b/tools/how-to-type.c
@@ -50,7 +50,7 @@ main(int argc, char *argv[])
const char *layout_ = NULL;
const char *variant = NULL;
const char *options = NULL;
- int exit = EXIT_FAILURE;
+ int err = EXIT_FAILURE;
struct xkb_context *ctx = NULL;
char *endp;
long val;
@@ -81,16 +81,19 @@ main(int argc, char *argv[])
break;
default:
usage(argv[0]);
+ exit(EXIT_INVALID_USAGE);
}
}
if (argc - optind != 1) {
usage(argv[0]);
+ exit(EXIT_INVALID_USAGE);
}
errno = 0;
val = strtol(argv[optind], &endp, 0);
if (errno != 0 || endp == argv[optind] || val < 0 || val > 0x10FFFF) {
usage(argv[0]);
+ exit(EXIT_INVALID_USAGE);
}
codepoint = (uint32_t) val;
@@ -188,9 +191,9 @@ main(int argc, char *argv[])
}
}
- exit = EXIT_SUCCESS;
+ err = EXIT_SUCCESS;
err:
xkb_keymap_unref(keymap);
xkb_context_unref(ctx);
- return exit;
+ return err;
}