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/lsmem.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/lsmem.c')
| -rw-r--r-- | sys-utils/lsmem.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/sys-utils/lsmem.c b/sys-utils/lsmem.c index 86383360a..a1272ae60 100644 --- a/sys-utils/lsmem.c +++ b/sys-utils/lsmem.c @@ -518,7 +518,7 @@ static void __attribute__((__noreturn__)) usage(void) printf(USAGE_MAN_TAIL("lsmem(1)")); - exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS); + exit(EXIT_SUCCESS); } int main(int argc, char **argv) @@ -563,7 +563,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, "abhJno:PrS:s:V", longopts, NULL)) != -1) { @@ -576,9 +576,6 @@ int main(int argc, char **argv) case 'b': lsmem->bytes = 1; break; - case 'h': - usage(); - break; case 'J': lsmem->json = 1; lsmem->want_summary = 0; @@ -607,9 +604,6 @@ int main(int argc, char **argv) case 'S': splitarg = optarg; break; - case 'V': - printf(UTIL_LINUX_VERSION); - return 0; case LSMEM_OPT_SUMARRY: if (optarg) { if (strcmp(optarg, "never") == 0) @@ -623,6 +617,11 @@ int main(int argc, char **argv) } else lsmem->want_table = 0; break; + + case 'h': + usage(); + case 'V': + print_version(EXIT_SUCCESS); default: errtryhelp(EXIT_FAILURE); } |