diff options
| author | Ruediger Meier | 2017-06-19 09:24:10 +0200 |
|---|---|---|
| committer | Ruediger Meier | 2017-06-26 14:38:24 +0200 |
| commit | 9325dbfd2018b2a3b510617f4aa13777fbbe23c3 (patch) | |
| tree | 07b7b9f9e99a77d9575284ae5b1b5ee9eb34101a /sys-utils/lsipc.c | |
| parent | flock, getopt: write --help to stdout and return 0 (diff) | |
| download | kernel-qcow2-util-linux-9325dbfd2018b2a3b510617f4aa13777fbbe23c3.tar.gz kernel-qcow2-util-linux-9325dbfd2018b2a3b510617f4aa13777fbbe23c3.tar.xz kernel-qcow2-util-linux-9325dbfd2018b2a3b510617f4aa13777fbbe23c3.zip | |
misc: cleanup and fix --unknownopt issues
Fixed checkusage.sh warnings:
rtcwake: --unknownopt, non-empty stdout
rtcwake: --unknownopt, stderr too long: 21
blockdev: --unknownopt, stderr too long: 28
lsipc: --unknownopt, stderr too long: 77
pg: --unknownopt, stderr too long: 23
renice: --unknownopt, stderr too long: 18
sulogin: --unknownopt, stderr too long: 17
write: --unknownopt, stderr too long: 12
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
Diffstat (limited to 'sys-utils/lsipc.c')
| -rw-r--r-- | sys-utils/lsipc.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sys-utils/lsipc.c b/sys-utils/lsipc.c index 3e7586b32..8ac50d67a 100644 --- a/sys-utils/lsipc.c +++ b/sys-utils/lsipc.c @@ -269,8 +269,9 @@ static int parse_time_mode(const char *s) errx(EXIT_FAILURE, _("unknown time format: %s"), s); } -static void __attribute__ ((__noreturn__)) usage(FILE * out) +static void __attribute__((__noreturn__)) usage(void) { + FILE *out = stdout; size_t i; fputs(USAGE_HEADER, out); @@ -327,7 +328,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out) fprintf(out, " %14s %s\n", coldescs[i].name, _(coldescs[i].help)); fprintf(out, USAGE_MAN_TAIL("lsipc(1)")); - exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS); + exit(EXIT_SUCCESS); } static struct libscols_table *new_table(struct lsipc_control *ctl) @@ -1223,12 +1224,12 @@ int main(int argc, char *argv[]) show_creat = 1; break; case 'h': - usage(stdout); + usage(); case 'V': printf(UTIL_LINUX_VERSION); return EXIT_SUCCESS; default: - usage(stderr); + errtryhelp(EXIT_FAILURE); } } |