git: fc26f24b3ef2 - main - colrm(1): Replace magic exit codes with standard macros
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 27 Nov 2024 12:22:44 UTC
The branch main has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=fc26f24b3ef276b2a9f73c9778aecff7377b1aeb commit fc26f24b3ef276b2a9f73c9778aecff7377b1aeb Author: Faraz Vahedi <kfv@kfv.io> AuthorDate: 2024-10-27 08:59:39 +0000 Commit: Mariusz Zaborski <oshogbo@FreeBSD.org> CommitDate: 2024-11-27 12:20:11 +0000 colrm(1): Replace magic exit codes with standard macros Signed-off-by: Faraz Vahedi <kfv@kfv.io> Reviewed by: markj, oshogbo MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/1496 --- usr.bin/colrm/colrm.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/usr.bin/colrm/colrm.c b/usr.bin/colrm/colrm.c index ffedc429eeb1..7f758b9cfbc6 100644 --- a/usr.bin/colrm/colrm.c +++ b/usr.bin/colrm/colrm.c @@ -68,12 +68,12 @@ main(int argc, char *argv[]) case 2: stop = strtol(argv[1], &p, 10); if (stop <= 0 || *p) - errx(1, "illegal column -- %s", argv[1]); + errx(EXIT_FAILURE, "illegal column -- %s", argv[1]); /* FALLTHROUGH */ case 1: start = strtol(argv[0], &p, 10); if (start <= 0 || *p) - errx(1, "illegal column -- %s", argv[0]); + errx(EXIT_FAILURE, "illegal column -- %s", argv[0]); break; case 0: break; @@ -82,7 +82,7 @@ main(int argc, char *argv[]) } if (stop && start > stop) - errx(1, "illegal start and stop columns"); + errx(EXIT_FAILURE, "illegal start and stop columns"); for (column = 0;;) { switch (ch = getwchar()) { @@ -115,15 +115,14 @@ void check(FILE *stream) { if (feof(stream)) - exit(0); + exit(EXIT_SUCCESS); if (ferror(stream)) - err(1, "%s", stream == stdin ? "stdin" : "stdout"); + err(EXIT_FAILURE, "%s", stream == stdin ? "stdin" : "stdout"); } void usage(void) { (void)fprintf(stderr, "usage: colrm [start [stop]]\n"); - exit(1); + exit(EXIT_FAILURE); } -