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

@@ -23,7 +23,7 @@ usage(void)
int
main(int argc, char *argv[])
{
int (*cryptfunc)(int, char **, struct crypt_ops *, uint8_t *, size_t) = cryptmain;
int ret = 0, (*cryptfunc)(int, char **, struct crypt_ops *, uint8_t *, size_t) = cryptmain;
uint8_t md[SHA512_DIGEST_LENGTH];
ARGBEGIN {
@@ -34,6 +34,8 @@ main(int argc, char *argv[])
usage();
} ARGEND;
return cryptfunc(argc, argv, &sha512_ops, md, sizeof(md)) ||
!!(fshut(stdin, "<stdin>") + fshut(stdout, "<stdout>"));
ret |= cryptfunc(argc, argv, &sha512_ops, md, sizeof(md));
ret |= fshut(stdin, "<stdin>") | fshut(stdout, "<stdout>");
return ret;
}