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 /misc-utils/wipefs.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 'misc-utils/wipefs.c')
| -rw-r--r-- | misc-utils/wipefs.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/misc-utils/wipefs.c b/misc-utils/wipefs.c index 209ed7147..0bd53253d 100644 --- a/misc-utils/wipefs.c +++ b/misc-utils/wipefs.c @@ -451,8 +451,9 @@ do_wipe(struct wipe_desc *wp, const char *devname, int flags) static void __attribute__((__noreturn__)) -usage(FILE *out) +usage(void) { + FILE *out = stdout; fputs(USAGE_HEADER, out); fprintf(out, _(" %s [options] <device>\n"), program_invocation_short_name); @@ -474,7 +475,7 @@ usage(FILE *out) fprintf(out, USAGE_MAN_TAIL("wipefs(8)")); - exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS); + exit(EXIT_SUCCESS); } @@ -525,7 +526,7 @@ main(int argc, char **argv) flags |= WP_FL_FORCE; break; case 'h': - usage(stdout); + usage(); break; case 'n': flags |= WP_FL_NOACT; @@ -552,8 +553,11 @@ main(int argc, char **argv) } } - if (optind == argc) - usage(stderr); + if (optind == argc) { + warnx(_("no device specified")); + errtryhelp(EXIT_FAILURE); + + } if ((flags & WP_FL_BACKUP) && !((flags & WP_FL_ALL) || has_offset)) warnx(_("The --backup option is meaningless in this context")); |