Commit f4f3449 for zlib
commit f4f34491eaa63a6493098251971f5dd28819b133
Author: Mark Adler <git@madler.net>
Date: Fri Feb 13 17:26:40 2026 -0800
Clean up debug sign conversions in deflate.c and trees.c.
diff --git a/deflate.c b/deflate.c
index 406aedf..b634cbd 100644
--- a/deflate.c
+++ b/deflate.c
@@ -1599,7 +1599,7 @@ local uInt longest_match(deflate_state *s, IPos cur_match) {
local void check_match(deflate_state *s, IPos start, IPos match, int length) {
/* check that the match is indeed a match */
Bytef *back = s->window + (int)match, *here = s->window + start;
- IPos len = length;
+ IPos len = (IPos)length;
if (match == (IPos)-1) {
/* match starts one byte before the current window -- just compare the
subsequent length-1 bytes */
@@ -1893,7 +1893,7 @@ local block_state deflate_fast(deflate_state *s, int flush) {
/* longest_match() sets match_start */
}
if (s->match_length >= MIN_MATCH) {
- check_match(s, s->strstart, s->match_start, s->match_length);
+ check_match(s, s->strstart, s->match_start, (int)s->match_length);
_tr_tally_dist(s, s->strstart - s->match_start,
s->match_length - MIN_MATCH, bflush);
@@ -2015,7 +2015,7 @@ local block_state deflate_slow(deflate_state *s, int flush) {
uInt max_insert = s->strstart + s->lookahead - MIN_MATCH;
/* Do not insert strings in hash table beyond this. */
- check_match(s, s->strstart - 1, s->prev_match, s->prev_length);
+ check_match(s, s->strstart - 1, s->prev_match, (int)s->prev_length);
_tr_tally_dist(s, s->strstart - 1 - s->prev_match,
s->prev_length - MIN_MATCH, bflush);
@@ -2123,7 +2123,7 @@ local block_state deflate_rle(deflate_state *s, int flush) {
/* Emit match if have run of MIN_MATCH or longer, else emit literal */
if (s->match_length >= MIN_MATCH) {
- check_match(s, s->strstart, s->strstart - 1, s->match_length);
+ check_match(s, s->strstart, s->strstart - 1, (int)s->match_length);
_tr_tally_dist(s, 1, s->match_length - MIN_MATCH, bflush);
diff --git a/trees.c b/trees.c
index 5ae0a91..e552436 100644
--- a/trees.c
+++ b/trees.c
@@ -188,7 +188,7 @@ local void bi_windup(deflate_state *s) {
s->bi_buf = 0;
s->bi_valid = 0;
#ifdef ZLIB_DEBUG
- s->bits_sent = (s->bits_sent + 7) & ~7;
+ s->bits_sent = (s->bits_sent + 7) & ~(ulg)7;
#endif
}
@@ -934,7 +934,7 @@ local void compress_block(deflate_state *s, const ct_data *ltree,
extra = extra_dbits[code];
if (extra != 0) {
dist -= (unsigned)base_dist[code];
- send_bits(s, dist, extra); /* send the extra distance bits */
+ send_bits(s, (int)dist, extra); /* send the extra bits */
}
} /* literal or match pair ? */
@@ -1085,7 +1085,7 @@ void ZLIB_INTERNAL _tr_flush_block(deflate_state *s, charf *buf,
#endif
}
Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len >> 3,
- s->compressed_len - 7*last));
+ s->compressed_len - 7*(ulg)last));
}
/* ===========================================================================