From 9141d8b9e5b737e68b4d754b2edfddbd6af5545f Mon Sep 17 00:00:00 2001 From: June McEnroe Date: Sun, 7 Jun 2020 15:04:16 -0400 Subject: Cast z_stream fields to size_t In the version of zlib in OpenBSD, these fields are of type off_t, which is signed (why?), rather than uLong. --- bin/glitch.c | 6 +++--- bin/pngo.c | 12 ++++++++---- 2 files changed, 11 insertions(+), 7 deletions(-) (limited to 'bin') diff --git a/bin/glitch.c b/bin/glitch.c index e97ffce4..acb2615c 100644 --- a/bin/glitch.c +++ b/bin/glitch.c @@ -238,10 +238,10 @@ static void readData(void) { } inflateEnd(&stream); - if (stream.total_out != dataSize()) { + if ((size_t)stream.total_out != dataSize()) { errx( - EX_DATAERR, "%s: expected data size %zu, found %lu", - path, dataSize(), stream.total_out + EX_DATAERR, "%s: expected data size %zu, found %zu", + path, dataSize(), (size_t)stream.total_out ); } } diff --git a/bin/pngo.c b/bin/pngo.c index 6c74297c..080e0b95 100644 --- a/bin/pngo.c +++ b/bin/pngo.c @@ -385,14 +385,18 @@ static void readData(struct Chunk chunk) { } inflateEnd(&stream); - if (stream.total_out != dataSize()) { + if ((size_t)stream.total_out != dataSize()) { errx( - EX_DATAERR, "%s: expected data size %zu, found %lu", - path, dataSize(), stream.total_out + EX_DATAERR, "%s: expected data size %zu, found %zu", + path, dataSize(), (size_t)stream.total_out ); } - if (verbose) fprintf(stderr, "%s: deflate size %lu\n", path, stream.total_in); + if (verbose) { + fprintf( + stderr, "%s: deflate size %zu\n", path, (size_t)stream.total_in + ); + } } static void writeData(void) { -- cgit 1.4.1