From 2c308875a7fa1aaa44892c368f6b37bcfcb8879a Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Tue, 16 Apr 2019 15:14:13 +0200 Subject: misc: consolidate version printing and close_stdout() Signed-off-by: Karel Zak --- sys-utils/blkzone.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'sys-utils/blkzone.c') 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); } -- cgit v1.2.3-55-g7522