diff options
| -rw-r--r-- | test/minigzip.c | 2 | ||||
| -rw-r--r-- | trees.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/test/minigzip.c b/test/minigzip.c index 1855575a..8df89373 100644 --- a/test/minigzip.c +++ b/test/minigzip.c | |||
| @@ -118,7 +118,7 @@ static char *strwinerror (error) | |||
| 118 | LocalFree(msgbuf); | 118 | LocalFree(msgbuf); |
| 119 | } | 119 | } |
| 120 | else { | 120 | else { |
| 121 | sprintf(buf, "unknown win32 error (%ld)", error); | 121 | sprintf(buf, "unknown win32 error (%lu)", error); |
| 122 | } | 122 | } |
| 123 | 123 | ||
| 124 | SetLastError(lasterr); | 124 | SetLastError(lasterr); |
| @@ -819,7 +819,7 @@ local int build_bl_tree(deflate_state *s) { | |||
| 819 | } | 819 | } |
| 820 | /* Update opt_len to include the bit length tree and counts */ | 820 | /* Update opt_len to include the bit length tree and counts */ |
| 821 | s->opt_len += 3*((ulg)max_blindex + 1) + 5 + 5 + 4; | 821 | s->opt_len += 3*((ulg)max_blindex + 1) + 5 + 5 + 4; |
| 822 | Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld", | 822 | Tracev((stderr, "\ndyn trees: dyn %lu, stat %lu", |
| 823 | s->opt_len, s->static_len)); | 823 | s->opt_len, s->static_len)); |
| 824 | 824 | ||
| 825 | return max_blindex; | 825 | return max_blindex; |
| @@ -845,13 +845,13 @@ local void send_all_trees(deflate_state *s, int lcodes, int dcodes, | |||
| 845 | Tracev((stderr, "\nbl code %2d ", bl_order[rank])); | 845 | Tracev((stderr, "\nbl code %2d ", bl_order[rank])); |
| 846 | send_bits(s, s->bl_tree[bl_order[rank]].Len, 3); | 846 | send_bits(s, s->bl_tree[bl_order[rank]].Len, 3); |
| 847 | } | 847 | } |
| 848 | Tracev((stderr, "\nbl tree: sent %ld", s->bits_sent)); | 848 | Tracev((stderr, "\nbl tree: sent %lu", s->bits_sent)); |
| 849 | 849 | ||
| 850 | send_tree(s, (ct_data *)s->dyn_ltree, lcodes - 1); /* literal tree */ | 850 | send_tree(s, (ct_data *)s->dyn_ltree, lcodes - 1); /* literal tree */ |
| 851 | Tracev((stderr, "\nlit tree: sent %ld", s->bits_sent)); | 851 | Tracev((stderr, "\nlit tree: sent %lu", s->bits_sent)); |
| 852 | 852 | ||
| 853 | send_tree(s, (ct_data *)s->dyn_dtree, dcodes - 1); /* distance tree */ | 853 | send_tree(s, (ct_data *)s->dyn_dtree, dcodes - 1); /* distance tree */ |
| 854 | Tracev((stderr, "\ndist tree: sent %ld", s->bits_sent)); | 854 | Tracev((stderr, "\ndist tree: sent %lu", s->bits_sent)); |
| 855 | } | 855 | } |
| 856 | 856 | ||
| 857 | /* =========================================================================== | 857 | /* =========================================================================== |
| @@ -1008,11 +1008,11 @@ void ZLIB_INTERNAL _tr_flush_block(deflate_state *s, charf *buf, | |||
| 1008 | 1008 | ||
| 1009 | /* Construct the literal and distance trees */ | 1009 | /* Construct the literal and distance trees */ |
| 1010 | build_tree(s, (tree_desc *)(&(s->l_desc))); | 1010 | build_tree(s, (tree_desc *)(&(s->l_desc))); |
| 1011 | Tracev((stderr, "\nlit data: dyn %ld, stat %ld", s->opt_len, | 1011 | Tracev((stderr, "\nlit data: dyn %lu, stat %lu", s->opt_len, |
| 1012 | s->static_len)); | 1012 | s->static_len)); |
| 1013 | 1013 | ||
| 1014 | build_tree(s, (tree_desc *)(&(s->d_desc))); | 1014 | build_tree(s, (tree_desc *)(&(s->d_desc))); |
| 1015 | Tracev((stderr, "\ndist data: dyn %ld, stat %ld", s->opt_len, | 1015 | Tracev((stderr, "\ndist data: dyn %lu, stat %lu", s->opt_len, |
| 1016 | s->static_len)); | 1016 | s->static_len)); |
| 1017 | /* At this point, opt_len and static_len are the total bit lengths of | 1017 | /* At this point, opt_len and static_len are the total bit lengths of |
| 1018 | * the compressed block data, excluding the tree representations. | 1018 | * the compressed block data, excluding the tree representations. |
