powerpc/boot: Use correct zlib types for comparison
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 11 Aug 2014 04:37:22 +0000 (14:37 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 13 Aug 2014 05:13:45 +0000 (15:13 +1000)
Avoids this warning:

arch/powerpc/boot/gunzip_util.c:118:9: warning: comparison of distinct pointer types lacks a cast

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
arch/powerpc/boot/gunzip_util.c

index ef2aed0f63ca8c6eb9523495513b0fc008fa96fa..9dc52501de83adab2062049773d62cd451aac361 100644 (file)
@@ -112,10 +112,10 @@ int gunzip_partial(struct gunzip_state *state, void *dst, int dstlen)
                r = zlib_inflate(&state->s, Z_FULL_FLUSH);
                if (r != Z_OK && r != Z_STREAM_END)
                        fatal("inflate returned %d msg: %s\n\r", r, state->s.msg);
-               len = state->s.next_out - (unsigned char *)dst;
+               len = state->s.next_out - (Byte *)dst;
        } else {
                /* uncompressed image */
-               len = min(state->s.avail_in, (unsigned)dstlen);
+               len = min(state->s.avail_in, (uLong)dstlen);
                memcpy(dst, state->s.next_in, len);
                state->s.next_in += len;
                state->s.avail_in -= len;