Simplify return & fshut() logic

Get rid of the !!()-constructs and use ret where available (or introduce it).

In some cases, there would be an "abort" on the first fshut-error, but we want
to close all files and report all warnings and then quit, not just the warning
for the first file.
This commit is contained in:
FRIGN
2015-05-25 01:33:19 +02:00
committed by sin
parent e8a4f37884
commit d23cc72490
34 changed files with 142 additions and 72 deletions

8
uniq.c
View File

@@ -97,7 +97,7 @@ int
main(int argc, char *argv[])
{
FILE *fp[2] = { stdin, stdout };
int i;
int ret = 0, i;
char *fname[2] = { "<stdin>", "<stdout>" };
ARGBEGIN {
@@ -134,7 +134,7 @@ main(int argc, char *argv[])
uniq(fp[0], fp[1]);
uniqfinish(fp[1]);
efshut(fp[0], fname[0]);
efshut(fp[1], fname[1]);
return 0;
ret |= fshut(fp[0], fname[0]) | fshut(fp[1], fname[1]);
return ret;
}