diff options
| author | Sean Bright <sean.bright@gmail.com> | 2017-04-21 13:04:44 -0400 |
|---|---|---|
| committer | Sean Bright <sean.bright@gmail.com> | 2017-04-25 16:24:15 -0500 |
| commit | f5b67871df566ddc0f0b6ad22d81a81d8ecce7d7 (patch) | |
| tree | 3b45a52fa39a04fc670f1efee2ec1099a56733e7 /apps/app_minivm.c | |
| parent | 8df729517e32926ea33aa3a40d5abcbf39488e3a (diff) | |
cleanup: Fix fread() and fwrite() error handling
Cleaned up some of the incorrect uses of fread() and fwrite(), mostly in
the format modules. Neither of these functions will ever return a value
less than 0, which we were checking for in some cases.
I've introduced a fair amount of duplication in the format modules, but
I plan to change how format modules work internally in a subsequent
patch set, so this is simply a stop-gap.
Change-Id: I8ca1cd47c20b2c0b72088bd13b9046f6977aa872
Diffstat (limited to 'apps/app_minivm.c')
| -rw-r--r-- | apps/app_minivm.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/apps/app_minivm.c b/apps/app_minivm.c index 4cc2f4796..ff9ab340a 100644 --- a/apps/app_minivm.c +++ b/apps/app_minivm.c @@ -854,16 +854,16 @@ static int b64_inbuf(struct b64_baseio *bio, FILE *fi) if (bio->ateof) return 0; - if ((l = fread(bio->iobuf, 1, B64_BASEMAXINLINE,fi)) <= 0) { - if (ferror(fi)) - return -1; - + if ((l = fread(bio->iobuf, 1, B64_BASEMAXINLINE, fi)) != B64_BASEMAXINLINE) { bio->ateof = 1; - return 0; + if (l == 0) { + /* Assume EOF */ + return 0; + } } - bio->iolen= l; - bio->iocp= 0; + bio->iolen = l; + bio->iocp = 0; return 1; } |