From 9325dbfd2018b2a3b510617f4aa13777fbbe23c3 Mon Sep 17 00:00:00 2001 From: Ruediger Meier Date: Mon, 19 Jun 2017 09:24:10 +0200 Subject: 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 --- sys-utils/rtcwake.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'sys-utils/rtcwake.c') diff --git a/sys-utils/rtcwake.c b/sys-utils/rtcwake.c index de0ac4d85..86c009536 100644 --- a/sys-utils/rtcwake.c +++ b/sys-utils/rtcwake.c @@ -88,8 +88,9 @@ struct rtcwake_control { dryrun:1; /* do not set alarm, suspend system, etc */ }; -static void __attribute__((__noreturn__)) usage(FILE *out) +static void __attribute__((__noreturn__)) usage(void) { + FILE *out = stdout; fputs(USAGE_HEADER, out); fprintf(out, _(" %s [options]\n"), program_invocation_short_name); @@ -113,13 +114,11 @@ static void __attribute__((__noreturn__)) usage(FILE *out) fputs(_(" -u, --utc RTC uses UTC\n"), out); fputs(_(" -v, --verbose verbose messages\n"), out); - printf(USAGE_SEPARATOR); - printf(USAGE_HELP); - printf(USAGE_VERSION); - + fputs(USAGE_SEPARATOR, out); + fputs(USAGE_HELP, out); + fputs(USAGE_VERSION, out); printf(USAGE_MAN_TAIL("rtcwake(8)")); - - exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS); + exit(EXIT_SUCCESS); } static int is_wakeup_enabled(const char *devname) @@ -496,9 +495,9 @@ int main(int argc, char **argv) printf(UTIL_LINUX_VERSION); exit(EXIT_SUCCESS); case 'h': - usage(stdout); + usage(); default: - usage(stderr); + errtryhelp(EXIT_FAILURE); } } -- cgit v1.2.3-55-g7522