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

View File

@@ -194,7 +194,7 @@ usage(void)
int
main(int argc, char *argv[])
{
int leftover = 0, i;
int ret = 0, leftover = 0, i;
size_t argsz, argmaxsz;
size_t arglen, a;
char *arg = "";
@@ -272,6 +272,8 @@ main(int argc, char *argv[])
free(argb);
return (nerrors || !!(fshut(stdin, "<stdin>") +
fshut(stdout, "<stdout>"))) ? 123 : 0;
if (nerrors || (fshut(stdin, "<stdin>") | fshut(stdout, "<stdout>")))
ret = 123;
return ret;
}