diff options
Diffstat (limited to 'src/Common/libzip/zip_fread.c')
| -rw-r--r-- | src/Common/libzip/zip_fread.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/Common/libzip/zip_fread.c b/src/Common/libzip/zip_fread.c index 646d7124..5b7da46a 100644 --- a/src/Common/libzip/zip_fread.c +++ b/src/Common/libzip/zip_fread.c @@ -1,9 +1,9 @@ /* zip_fread.c -- read from file - Copyright (C) 1999-2019 Dieter Baron and Thomas Klausner + Copyright (C) 1999-2021 Dieter Baron and Thomas Klausner This file is part of libzip, a library to manipulate ZIP archives. - The authors can be contacted at <libzip@nih.at> + The authors can be contacted at <info@libzip.org> Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions @@ -40,22 +40,23 @@ zip_fread(zip_file_t *zf, void *outbuf, zip_uint64_t toread) { zip_int64_t n; if (!zf) - return -1; + return -1; if (zf->error.zip_err != 0) - return -1; + return -1; if (toread > ZIP_INT64_MAX) { - zip_error_set(&zf->error, ZIP_ER_INVAL, 0); - return -1; + zip_error_set(&zf->error, ZIP_ER_INVAL, 0); + return -1; } - if ((zf->eof) || (toread == 0)) - return 0; + if (toread == 0) { + return 0; + } if ((n = zip_source_read(zf->src, outbuf, toread)) < 0) { - _zip_error_set_from_source(&zf->error, zf->src); - return -1; + zip_error_set_from_source(&zf->error, zf->src); + return -1; } return n; |