Make read_huffsym() return unsigned int

diff --git a/include/wimlib/decompress_common.h b/include/wimlib/decompress_common.h
index 148b44ef63d0ee5db26509140d13f95f0dbabf87..420f7f41e3adf8a207248241a41aee0db3ee3879 100644 (file)
--- a/include/wimlib/decompress_common.h
+++ b/include/wimlib/decompress_common.h
@@ -214,7 +214,7 @@ bitstream_align(struct input_bitstream *is)
  *
  * XXX: This is mostly duplicated in lzms_decode_huffman_symbol() in
  * lzms_decompress.c.  */
  *
  * 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)
 {
 read_huffsym(struct input_bitstream *istream, const u16 decode_table[],
             unsigned table_bits, unsigned max_codeword_len)
 {

diff --git a/src/lzx_decompress.c b/src/lzx_decompress.c
index fe5bdbad02240a1f1ec21e3516fd9424f34bec5d..86c0839038ac0d396acf65ff88c3e62e7e828e69 100644 (file)
--- a/src/lzx_decompress.c
+++ b/src/lzx_decompress.c
@@ -116,7 +116,7 @@ struct lzx_decompressor {
 };
 
 /* Read a Huffman-encoded symbol using the precode.  */
 };
 
 /* 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[])
 {
 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.  */
 }
 
 /* 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)
 {
 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.  */
 }
 
 /* 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)
 {
 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.  */
 }
 
 /* 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)
 {
 read_huffsym_using_alignedcode(struct input_bitstream *istream,
                               const struct lzx_tables *tables)
 {