xpress-decompress.c: Store 'len_hdr' and 'offset_bsr' in unsigned ints

[wimlib] / src / xpress-decompress.c

diff --git a/src/xpress-decompress.c b/src/xpress-decompress.c
index 1ab81e3192ea72de6e15c4a56d1fc7d76c014439..855f2cb311ccb156db1ecd9e00600c86255e458a 100644 (file)
--- a/src/xpress-decompress.c
+++ b/src/xpress-decompress.c
@@ -90,8 +90,8 @@ xpress_decode_match(unsigned sym, input_idx_t window_pos,
                    struct input_bitstream * restrict istream)
 {
 
-       u8 len_hdr;
-       u8 offset_bsr;
+       unsigned len_hdr;
+       unsigned offset_bsr;
        u8 *match_dest;
        u8 *match_src;
        unsigned i;
@@ -144,7 +144,6 @@ static int
 xpress_lz_decode(struct input_bitstream * restrict istream,
                 u8 uncompressed_data[restrict],
                 unsigned uncompressed_len,
-                const u8 lens[restrict],
                 const u16 decode_table[restrict])
 {
        input_idx_t curpos;
@@ -157,8 +156,7 @@ xpress_lz_decode(struct input_bitstream * restrict istream,
                bitstream_ensure_bits(istream, 16);
 
                sym = read_huffsym(istream, decode_table,
-                                  XPRESS_NUM_SYMBOLS, XPRESS_TABLEBITS,
-                                  XPRESS_MAX_CODEWORD_LEN);
+                                  XPRESS_TABLEBITS, XPRESS_MAX_CODEWORD_LEN);
                if (sym < XPRESS_NUM_CHARS) {
                        /* Literal  */
                        uncompressed_data[curpos] = sym;
@@ -211,7 +209,7 @@ xpress_decompress(const void *compressed_data, size_t compressed_size,
                             compressed_size - XPRESS_NUM_SYMBOLS / 2);
 
        return xpress_lz_decode(&istream, uncompressed_data,
-                               uncompressed_size, lens, decode_table);
+                               uncompressed_size, decode_table);
 }
 
 const struct decompressor_ops xpress_decompressor_ops = {