diff options
Diffstat (limited to 'lib/libz/gzread.c')
| -rw-r--r-- | lib/libz/gzread.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/lib/libz/gzread.c b/lib/libz/gzread.c index abbd5310e30..52813214220 100644 --- a/lib/libz/gzread.c +++ b/lib/libz/gzread.c @@ -1,6 +1,6 @@ -/* $OpenBSD: gzread.c,v 1.1 2021/07/04 14:24:49 tb Exp $ */ +/* $OpenBSD: gzread.c,v 1.2 2022/05/08 14:04:22 tb Exp $ */ /* 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 */ @@ -315,9 +315,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) { @@ -398,7 +398,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) @@ -448,7 +448,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; @@ -470,8 +469,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) |