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 /disk-utils/partx.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 'disk-utils/partx.c')
| -rw-r--r-- | disk-utils/partx.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/disk-utils/partx.c b/disk-utils/partx.c index 93fbc9c1d..9a868cd81 100644 --- a/disk-utils/partx.c +++ b/disk-utils/partx.c @@ -743,8 +743,9 @@ static blkid_partlist get_partlist(blkid_probe pr, return ls; } -static void __attribute__((__noreturn__)) usage(FILE *out) +static void __attribute__((__noreturn__)) usage(void) { + FILE *out = stdout; size_t i; fputs(USAGE_HEADER, out); @@ -781,7 +782,7 @@ static void __attribute__((__noreturn__)) usage(FILE *out) fprintf(out, USAGE_MAN_TAIL("partx(8)")); - exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS); + exit(EXIT_SUCCESS); } int main(int argc, char **argv) @@ -891,7 +892,7 @@ int main(int argc, char **argv) return EXIT_SUCCESS; } case 'h': - usage(stdout); + usage(); case 'V': printf(UTIL_LINUX_VERSION); return EXIT_SUCCESS; @@ -963,9 +964,10 @@ int main(int argc, char **argv) device = NULL; part_devno = 0; } - } else - usage(stderr); - + } else { + warnx(_("bad usage")); + errtryhelp(EXIT_FAILURE); + } if (device && (upper || lower)) errx(EXIT_FAILURE, _("--nr and <partition> are mutually exclusive")); |