diff options
| author | June McEnroe <june@causal.agency> | 2020-06-07 15:04:16 -0400 |
|---|---|---|
| committer | June McEnroe <june@causal.agency> | 2020-06-07 15:04:16 -0400 |
| commit | 5b1657f1d6f3e7f6f8f75d3601e57c566ac6a3bb (patch) | |
| tree | 77ad9f5d2a85de978677e8db439f57e4a3e00a65 | |
| parent | Call static_assert by _Static_assert (diff) | |
| download | src-5b1657f1d6f3e7f6f8f75d3601e57c566ac6a3bb.tar.gz src-5b1657f1d6f3e7f6f8f75d3601e57c566ac6a3bb.zip | |
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.
| -rw-r--r-- | bin/glitch.c | 6 | ||||
| -rw-r--r-- | bin/pngo.c | 12 |
2 files changed, 11 insertions, 7 deletions
diff --git a/bin/glitch.c b/bin/glitch.c index 3d8bc8f7..9747f35a 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 78738d86..322cb1ba 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) { |