diff options
| author | Pádraig Brady <P@draigBrady.com> | 2016-10-15 23:10:35 +0100 |
|---|---|---|
| committer | Pádraig Brady <P@draigBrady.com> | 2016-10-16 12:23:55 +0100 |
| commit | 492dcb2eb191b844a2fd5e51db3eed85289bea1f (patch) | |
| tree | 910f93d88891b573520ebd5c812d61ddc7fbeed8 /src/uniq.c | |
| parent | d035eacfdeba2da0134e606c8a63b2f3c0bd05bb (diff) | |
| download | coreutils-492dcb2eb191b844a2fd5e51db3eed85289bea1f.tar.xz | |
all: use die() rather than error(EXIT_FAILURE)
die() has the advantage of being apparent to the compiler
that it doesn't return, which will avoid warnings in some cases,
and possibly generate better code.
* cfg.mk (sc_die_EXIT_FAILURE): A new syntax check rule to
catch any new uses of error (CONSTANT, ...);
Diffstat (limited to 'src/uniq.c')
| -rw-r--r-- | src/uniq.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/uniq.c b/src/uniq.c index 896ce938f..87a0c9301 100644 --- a/src/uniq.c +++ b/src/uniq.c @@ -24,6 +24,7 @@ #include "system.h" #include "argmatch.h" #include "linebuffer.h" +#include "die.h" #include "error.h" #include "fadvise.h" #include "hard-locale.h" @@ -249,7 +250,7 @@ size_opt (char const *opt, char const *msgid) break; default: - error (EXIT_FAILURE, 0, "%s: %s", opt, _(msgid)); + die (EXIT_FAILURE, 0, "%s: %s", opt, _(msgid)); } return MIN (size, SIZE_MAX); @@ -334,9 +335,9 @@ check_file (const char *infile, const char *outfile, char delimiter) struct linebuffer *thisline, *prevline; if (! (STREQ (infile, "-") || freopen (infile, "r", stdin))) - error (EXIT_FAILURE, errno, "%s", quotef (infile)); + die (EXIT_FAILURE, errno, "%s", quotef (infile)); if (! (STREQ (outfile, "-") || freopen (outfile, "w", stdout))) - error (EXIT_FAILURE, errno, "%s", quotef (outfile)); + die (EXIT_FAILURE, errno, "%s", quotef (outfile)); fadvise (stdin, FADVISE_SEQUENTIAL); @@ -433,7 +434,7 @@ check_file (const char *infile, const char *outfile, char delimiter) if (match_count == UINTMAX_MAX) { if (count_occurrences) - error (EXIT_FAILURE, 0, _("too many repeated lines")); + die (EXIT_FAILURE, 0, _("too many repeated lines")); match_count--; } @@ -469,7 +470,7 @@ check_file (const char *infile, const char *outfile, char delimiter) closefiles: if (ferror (stdin) || fclose (stdin) != 0) - error (EXIT_FAILURE, 0, _("error reading %s"), quoteaf (infile)); + die (EXIT_FAILURE, 0, _("error reading %s"), quoteaf (infile)); /* stdout is handled via the atexit-invoked close_stdout function. */ |