diff options
| author | Karel Zak | 2019-04-16 15:14:13 +0200 |
|---|---|---|
| committer | Karel Zak | 2019-04-16 15:14:13 +0200 |
| commit | 2c308875a7fa1aaa44892c368f6b37bcfcb8879a (patch) | |
| tree | 157ea7afca59059676dbcc25133dd196d1e45fb8 /sys-utils/tunelp.c | |
| parent | include/c: add print_version() macro (diff) | |
| download | kernel-qcow2-util-linux-2c308875a7fa1aaa44892c368f6b37bcfcb8879a.tar.gz kernel-qcow2-util-linux-2c308875a7fa1aaa44892c368f6b37bcfcb8879a.tar.xz kernel-qcow2-util-linux-2c308875a7fa1aaa44892c368f6b37bcfcb8879a.zip | |
misc: consolidate version printing and close_stdout()
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'sys-utils/tunelp.c')
| -rw-r--r-- | sys-utils/tunelp.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sys-utils/tunelp.c b/sys-utils/tunelp.c index fe261f393..b1e7f75df 100644 --- a/sys-utils/tunelp.c +++ b/sys-utils/tunelp.c @@ -144,7 +144,7 @@ int main(int argc, char **argv) setlocale(LC_ALL, ""); bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); - atexit(close_stdout); + close_stdout_atexit(); strutils_set_exitcode(EXIT_LP_BADVAL); @@ -159,9 +159,6 @@ int main(int argc, char **argv) show_irq = 1; while ((c = getopt_long(argc, argv, "t:c:w:a:i:ho:C:sq:rT:vV", longopts, NULL)) != -1) { switch (c) { - case 'h': - usage(); - break; case 'i': cmds->op = LPSETIRQ; cmds->val = strtol_or_err(optarg, _("argument error")); @@ -229,10 +226,12 @@ int main(int argc, char **argv) cmds = cmds->next; cmds->next = NULL; break; + + case 'h': + usage(); case 'v': case 'V': - printf(UTIL_LINUX_VERSION); - return EXIT_SUCCESS; + print_version(EXIT_SUCCESS); default: errtryhelp(EXIT_FAILURE); } |