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/blkzone.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/blkzone.c')
| -rw-r--r-- | sys-utils/blkzone.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sys-utils/blkzone.c b/sys-utils/blkzone.c index 1dcbdf500..5fd5da7a3 100644 --- a/sys-utils/blkzone.c +++ b/sys-utils/blkzone.c @@ -357,7 +357,7 @@ int main(int argc, char **argv) setlocale(LC_ALL, ""); bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); - atexit(close_stdout); + close_stdout_atexit(); if (argc >= 2 && *argv[1] != '-') { ctl.command = name_to_command(argv[1]); @@ -372,9 +372,6 @@ int main(int argc, char **argv) err_exclusive_options(c, longopts, excl, excl_st); switch (c) { - case 'h': - usage(); - break; case 'c': ctl.count = strtou32_or_err(optarg, _("failed to parse number of zones")); @@ -390,9 +387,11 @@ int main(int argc, char **argv) case 'v': ctl.verbose = 1; break; + + case 'h': + usage(); case 'V': - printf(UTIL_LINUX_VERSION); - return EXIT_SUCCESS; + print_version(EXIT_SUCCESS); default: errtryhelp(EXIT_FAILURE); } |