Make read_huffsym() return unsigned int
authorEric Biggers <ebiggers3@gmail.com>
Mon, 20 Jul 2015 03:18:10 +0000 (22:18 -0500)
committerEric Biggers <ebiggers3@gmail.com>
Mon, 20 Jul 2015 03:18:18 +0000 (22:18 -0500)
include/wimlib/decompress_common.h
src/lzx_decompress.c

index 148b44e..420f7f4 100644 (file)
@@ -214,7 +214,7 @@ bitstream_align(struct input_bitstream *is)
  *
  * XXX: This is mostly duplicated in lzms_decode_huffman_symbol() in
  * lzms_decompress.c.  */
-static inline u16
+static inline unsigned
 read_huffsym(struct input_bitstream *istream, const u16 decode_table[],
             unsigned table_bits, unsigned max_codeword_len)
 {
index fe5bdba..86c0839 100644 (file)
@@ -116,7 +116,7 @@ struct lzx_decompressor {
 };
 
 /* Read a Huffman-encoded symbol using the precode.  */
-static inline u16
+static inline unsigned
 read_huffsym_using_precode(struct input_bitstream *istream,
                           const u16 precode_decode_table[])
 {
@@ -125,7 +125,7 @@ read_huffsym_using_precode(struct input_bitstream *istream,
 }
 
 /* Read a Huffman-encoded symbol using the main code.  */
-static inline u16
+static inline unsigned
 read_huffsym_using_maincode(struct input_bitstream *istream,
                            const struct lzx_tables *tables)
 {
@@ -134,7 +134,7 @@ read_huffsym_using_maincode(struct input_bitstream *istream,
 }
 
 /* Read a Huffman-encoded symbol using the length code.  */
-static inline u16
+static inline unsigned
 read_huffsym_using_lencode(struct input_bitstream *istream,
                           const struct lzx_tables *tables)
 {
@@ -143,7 +143,7 @@ read_huffsym_using_lencode(struct input_bitstream *istream,
 }
 
 /* Read a Huffman-encoded symbol using the aligned offset code.  */
-static inline u16
+static inline unsigned
 read_huffsym_using_alignedcode(struct input_bitstream *istream,
                               const struct lzx_tables *tables)
 {