diff options
| author | Ruediger Meier | 2017-06-19 20:51:50 +0200 |
|---|---|---|
| committer | Ruediger Meier | 2017-06-26 14:38:24 +0200 |
| commit | 5118d1be2ade514079f5506bafdf028389ff362e (patch) | |
| tree | 4c84d14033e431dff9ade15678136ae8b6f4b4ef /disk-utils/fsck.cramfs.c | |
| parent | misc: cleanup and fix --unknownopt issues (diff) | |
| download | kernel-qcow2-util-linux-5118d1be2ade514079f5506bafdf028389ff362e.tar.gz kernel-qcow2-util-linux-5118d1be2ade514079f5506bafdf028389ff362e.tar.xz kernel-qcow2-util-linux-5118d1be2ade514079f5506bafdf028389ff362e.zip | |
misc: never use usage(ERROR)
We are using better/shorter error messages and somtimes
also errtryhelp().
Here we fix all cases where the usage function took
an int argument for exit_code.
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
Diffstat (limited to 'disk-utils/fsck.cramfs.c')
| -rw-r--r-- | disk-utils/fsck.cramfs.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/disk-utils/fsck.cramfs.c b/disk-utils/fsck.cramfs.c index 1dba95eb5..ff056c869 100644 --- a/disk-utils/fsck.cramfs.c +++ b/disk-utils/fsck.cramfs.c @@ -102,11 +102,9 @@ static char *outbuffer; static size_t blksize = 0; - -/* Input status of 0 to print help and exit without an error. */ -static void __attribute__((__noreturn__)) usage(int status) +static void __attribute__((__noreturn__)) usage(void) { - FILE *out = status ? stderr : stdout; + FILE *out = stdout; fputs(USAGE_HEADER, out); fprintf(out, @@ -126,7 +124,7 @@ static void __attribute__((__noreturn__)) usage(int status) fputs(USAGE_VERSION, out); fputs(USAGE_SEPARATOR, out); - exit(status); + exit(FSCK_EX_OK); } static int get_superblock_endianness(uint32_t magic) @@ -669,7 +667,7 @@ int main(int argc, char **argv) case 'y': break; case 'h': - usage(FSCK_EX_OK); + usage(); break; case 'V': printf(UTIL_LINUX_VERSION); @@ -689,8 +687,10 @@ int main(int argc, char **argv) errtryhelp(FSCK_EX_USAGE); } - if ((argc - optind) != 1) - usage(FSCK_EX_USAGE); + if ((argc - optind) != 1){ + warnx(_("bad usage")); + errtryhelp(FSCK_EX_USAGE); + } filename = argv[optind]; test_super(&start, &length); |