diff options
| author | Ruediger Meier | 2017-06-19 20:52:50 +0200 |
|---|---|---|
| committer | Ruediger Meier | 2017-06-26 14:38:24 +0200 |
| commit | 6e1eda6f229f87b77471ce6eb7cbf0ede7c8029e (patch) | |
| tree | 5e74a0cd99493e934780db2b434c75e995a6bd17 /sys-utils/lsmem.c | |
| parent | misc: never use usage(ERROR) (diff) | |
| download | kernel-qcow2-util-linux-6e1eda6f229f87b77471ce6eb7cbf0ede7c8029e.tar.gz kernel-qcow2-util-linux-6e1eda6f229f87b77471ce6eb7cbf0ede7c8029e.tar.xz kernel-qcow2-util-linux-6e1eda6f229f87b77471ce6eb7cbf0ede7c8029e.zip | |
misc: never use usage(stderr)
Here we fix all cases where we have usage(FILE*)
functions.
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
Diffstat (limited to 'sys-utils/lsmem.c')
| -rw-r--r-- | sys-utils/lsmem.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sys-utils/lsmem.c b/sys-utils/lsmem.c index 891be36f7..4efd29632 100644 --- a/sys-utils/lsmem.c +++ b/sys-utils/lsmem.c @@ -363,8 +363,9 @@ static void read_basic_info(struct lsmem *lsmem) lsmem->have_nodes = 1; } -static void __attribute__((__noreturn__)) lsmem_usage(FILE *out) +static void __attribute__((__noreturn__)) usage(void) { + FILE *out = stdout; unsigned int i; fputs(USAGE_HEADER, out); @@ -449,7 +450,7 @@ int main(int argc, char **argv) lsmem->bytes = 1; break; case 'h': - lsmem_usage(stdout); + usage(); break; case 'J': lsmem->json = 1; @@ -493,8 +494,10 @@ int main(int argc, char **argv) } } - if (argc != optind) - lsmem_usage(stderr); + if (argc != optind) { + warnx(_("bad usage")); + errtryhelp(EXIT_FAILURE); + } if (lsmem->want_table + lsmem->want_summary == 0) errx(EXIT_FAILURE, _("options --{raw,json,pairs} and --summary=only are mutually exclusive")); |