VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Common/zlib/gzread.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/Common/zlib/gzread.c')
-rw-r--r--src/Common/zlib/gzread.c12
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,3 +1,3 @@
/* 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
@@ -316,5 +316,5 @@ local z_size_t gz_read(state, buf, len)
/* 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;
@@ -399,3 +399,3 @@ 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);
@@ -449,3 +449,2 @@ int ZEXPORT gzgetc(file)
{
- int ret;
unsigned char buf[1];
@@ -471,4 +470,3 @@ 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];
}