From: Eric Biggers <ebiggers3@gmail.com>
Date: Mon, 20 Jul 2015 03:18:10 +0000 (-0500)
Subject: Make read_huffsym() return unsigned int
X-Git-Tag: v1.8.2~42
X-Git-Url: https://wimlib.net/git/?p=wimlib;a=commitdiff_plain;h=141ce5b36cf27f8b1a78f17d070f6a627105aabd

Make read_huffsym() return unsigned int
---

diff --git a/include/wimlib/decompress_common.h b/include/wimlib/decompress_common.h
index 148b44ef..420f7f41 100644
--- 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.  */
-static inline u16
+static inline unsigned
 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 fe5bdbad..86c08390 100644
--- 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.  */
-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)
 {