From 8f6c80710fac345c057680d52a1200972d478980 Mon Sep 17 00:00:00 2001 From: Mika Lindqvist Date: Sun, 22 Nov 2015 17:15:58 +0200 Subject: [PATCH] Type cleanup. --- arch/x86/insert_string_sse.c | 4 ++-- uncompr.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/insert_string_sse.c b/arch/x86/insert_string_sse.c index 1e8ec95c..90c619a8 100644 --- a/arch/x86/insert_string_sse.c +++ b/arch/x86/insert_string_sse.c @@ -16,9 +16,9 @@ * (except for the last MIN_MATCH-1 bytes of the input file). */ #ifdef X86_SSE4_2_CRC_HASH -Pos insert_string_sse(deflate_state *const s, const Pos str, uInt count) { +Pos insert_string_sse(deflate_state *const s, const Pos str, unsigned int count) { Pos ret = 0; - uInt idx; + unsigned int idx; unsigned *ip, val, h = 0; for (idx = 0; idx < count; idx++) { diff --git a/uncompr.c b/uncompr.c index 9799eb99..9bfb1e1e 100644 --- a/uncompr.c +++ b/uncompr.c @@ -52,11 +52,11 @@ int ZEXPORT uncompress(unsigned char *dest, uLong *destLen, const unsigned char do { if (stream.avail_out == 0) { - stream.avail_out = left > (uLong)max ? max : (uInt)left; + stream.avail_out = left > (unsigned long)max ? max : (unsigned int)left; left -= stream.avail_out; } if (stream.avail_in == 0) { - stream.avail_in = sourceLen > (uLong)max ? max : (uInt)sourceLen; + stream.avail_in = sourceLen > (unsigned long)max ? max : (unsigned int)sourceLen; sourceLen -= stream.avail_in; } err = inflate(&stream, Z_NO_FLUSH); -- 2.47.2