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/swapoff.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/swapoff.c')
| -rw-r--r-- | sys-utils/swapoff.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sys-utils/swapoff.c b/sys-utils/swapoff.c index 0a3807fda..a13d4f1e5 100644 --- a/sys-utils/swapoff.c +++ b/sys-utils/swapoff.c @@ -197,7 +197,7 @@ int main(int argc, char *argv[]) setlocale(LC_ALL, ""); bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); - atexit(close_stdout); + close_stdout_atexit(); while ((c = getopt_long(argc, argv, "ahvVL:U:", long_opts, NULL)) != -1) { @@ -205,21 +205,20 @@ int main(int argc, char *argv[]) case 'a': /* all */ ++all; break; - case 'h': /* help */ - usage(); - break; case 'v': /* be chatty */ ++verbose; break; - case 'V': /* version */ - printf(UTIL_LINUX_VERSION); - return EXIT_SUCCESS; case 'L': add_label(optarg); break; case 'U': add_uuid(optarg); break; + + case 'h': /* help */ + usage(); + case 'V': /* version */ + print_version(EXIT_SUCCESS); default: errtryhelp(EXIT_FAILURE); } |