diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2022-03-31 00:50:51 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2022-03-31 00:52:40 +0200 |
| commit | 08716954031eb0329fbd1ad2cd3fa593d3a046ab (patch) | |
| tree | 48683dcf0639fbe7b84e00ea02dacaa4de9fe577 /src/Common/zlib/gzread.c | |
| parent | 2be0b2e88ffebf9b63dcda4048ab0a24cd6ec131 (diff) | |
| download | VeraCrypt-08716954031eb0329fbd1ad2cd3fa593d3a046ab.tar.gz VeraCrypt-08716954031eb0329fbd1ad2cd3fa593d3a046ab.zip | |
Update zlib to version 1.2.12
Diffstat (limited to 'src/Common/zlib/gzread.c')
| -rw-r--r-- | src/Common/zlib/gzread.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/Common/zlib/gzread.c b/src/Common/zlib/gzread.c index 956b91ea..884c9bfe 100644 --- a/src/Common/zlib/gzread.c +++ b/src/Common/zlib/gzread.c @@ -1,5 +1,5 @@ /* gzread.c -- zlib functions for reading gzip files - * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler + * Copyright (C) 2004-2017 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -314,9 +314,9 @@ local z_size_t gz_read(state, buf, len) got = 0; do { /* set n to the maximum amount of len that fits in an unsigned int */ - n = -1; + n = (unsigned)-1; if (n > len) - n = len; + n = (unsigned)len; /* first just try copying data from the output buffer */ if (state->x.have) { @@ -397,7 +397,7 @@ int ZEXPORT gzread(file, buf, len) } /* read len or fewer bytes to buf */ - len = gz_read(state, buf, len); + len = (unsigned)gz_read(state, buf, len); /* check for an error */ if (len == 0 && state->err != Z_OK && state->err != Z_BUF_ERROR) @@ -447,7 +447,6 @@ z_size_t ZEXPORT gzfread(buf, size, nitems, file) int ZEXPORT gzgetc(file) gzFile file; { - int ret; unsigned char buf[1]; gz_statep state; @@ -469,8 +468,7 @@ int ZEXPORT gzgetc(file) } /* nothing there -- try gz_read() */ - ret = gz_read(state, buf, 1); - return ret < 1 ? -1 : buf[0]; + return gz_read(state, buf, 1) < 1 ? -1 : buf[0]; } int ZEXPORT gzgetc_(file) |