From 2ee1c3bcb1ce71e2d15290e405652796698dd91e Mon Sep 17 00:00:00 2001 From: June McEnroe Date: Thu, 22 Feb 2018 22:44:02 -0500 Subject: Fix zlib types on 32-bit --- bin/gfxx.c | 2 +- bin/pngo.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/gfxx.c b/bin/gfxx.c index b5512d9d..628d6003 100644 --- a/bin/gfxx.c +++ b/bin/gfxx.c @@ -326,7 +326,7 @@ static void pngDump(uint32_t *src, size_t srcWidth, size_t srcHeight) { } } - size_t dataSize = compressBound(sizeof(filt)); + uLong dataSize = compressBound(sizeof(filt)); uint8_t data[dataSize]; error = compress(data, &dataSize, filt, sizeof(filt)); if (error != Z_OK) errx(EX_SOFTWARE, "compress: %d", error); diff --git a/bin/pngo.c b/bin/pngo.c index 84c81444..9bc85d0a 100644 --- a/bin/pngo.c +++ b/bin/pngo.c @@ -79,14 +79,14 @@ static struct Chunk readChunk(void) { struct Chunk chunk; readExpect(&chunk, sizeof(chunk), "chunk"); chunk.size = ntohl(chunk.size); - crc = crc32(CRC_INIT, (Bytef *)chunk.type, sizeof(chunk.type)); + crc = crc32(CRC_INIT, (Byte *)chunk.type, sizeof(chunk.type)); return chunk; } static void writeChunk(struct Chunk chunk) { chunk.size = htonl(chunk.size); writeExpect(&chunk, sizeof(chunk)); - crc = crc32(CRC_INIT, (Bytef *)chunk.type, sizeof(chunk.type)); + crc = crc32(CRC_INIT, (Byte *)chunk.type, sizeof(chunk.type)); } static void readCrc(void) { @@ -112,7 +112,7 @@ enum PACKED Color { TRUECOLOR = 2, INDEXED = 3, GRAYSCALE_ALPHA = 4, - TRUECOLOR_ALPHA = 6 + TRUECOLOR_ALPHA = 6, }; static struct PACKED { @@ -288,14 +288,14 @@ static void readData(void) { if (stream.total_out != dataSize()) { errx( - EX_DATAERR, "%s: expected data size %zu, found %zu", + EX_DATAERR, "%s: expected data size %zu, found %lu", path, dataSize(), stream.total_out ); } } static void writeData(void) { - size_t size = compressBound(dataSize()); + uLong size = compressBound(dataSize()); uint8_t deflate[size]; int error = compress2(deflate, &size, data, dataSize(), Z_BEST_COMPRESSION); if (error != Z_OK) errx(EX_SOFTWARE, "%s: compress2: %d", path, error); -- cgit 1.4.1 711ff6cc19c8fd3f28412845a33faf50&follow=1'>tests (unfollow)
Commit message (Expand)Author
2014-12-28ui-patch: match git-format-patch(1) outputJohn Keeping
2014-12-28t0108: modernize styleJohn Keeping
2014-12-24Revert "git: use xz compressed archive for download"Jason A. Donenfeld
2014-12-24Use split_ident_line() in parse_user()Lukas Fleischer
2014-12-23footer: link back to cgit home pageJason A. Donenfeld
2014-12-23ui-shared: show absolute time in tooltip for relative datesJohn Keeping
2014-12-23git: use xz compressed archive for downloadChristian Hesse
2014-12-23match other common markdown file extensionsChris Burroughs
2014-12-23repolist: add owner-filterChris Burroughs
2014-12-23ui-shared: add rel-vcs microformat links to HTML headerJohn Keeping
2014-12-23ui-summary: add "rel='vcs-git'" to clone URL linksJohn Keeping
2014-12-23Extract clone URL printing to ui-shared.cJohn Keeping
2014-12-23Remove trailing slash after remove-suffixLukas Fleischer
2014-12-23git: update to v2.2.1Christian Hesse
2014-12-13filter: fix libravatar email-filter https issueChristian Hesse
2014-12-13ui-diff: add "stat only" diff typeJohn Keeping
2014-12-13Change "ss" diff flag to an enumJohn Keeping
2014-12-13ui-shared: remove toggle_ssdiff arg to cgit_diff_link()John Keeping
2014-12-13ui-shared: remove toggle_ssdiff arg to cgit_commit_link()John Keeping
2014-08-07git: update to v2.0.4John Keeping
2014-08-07Always check if README exists in choose_readme()Lukas Fleischer
2014-08-01cgitrc.5: we mean a cgi response, not requestJason A. Donenfeld
2014-07-28ui-stats.c: set parent pointer to NULL after freeing itJohn Keeping
2014-07-28git: update to v2.0.3John Keeping
2014-07-28parsing.c: make commit buffer constJohn Keeping
2014-06-30Bump version.Jason A. Donenfeld
2014-06-29remove debug fprinf() calls that sneaked in with commit 79c985Christian Hesse
2014-06-28git: update to 2.0.1Christian Hesse
2014-06-28ui-patch: Flush stdout after outputting dataJohn Keeping
2014-06-28ui-log: ignore unhandled argumentsJohn Keeping
2014-06-28git: update for git 2.0Christian Hesse
2014-04-17remove trailing whitespaces from source filesChristian Hesse
2014-04-12git: update to 1.9.2Christian Hesse
2014-04-05Fix cgit_parse_url when a repo url is contained in another repo urlJulian Maurice
2014-03-20Makefile: use more reliable git tarball mirrorJason A. Donenfeld
2014-03-20git: update to 1.9.1Christian Hesse