From: Eric Biggers <ebiggers3@gmail.com>
Date: Fri, 21 Dec 2012 04:14:42 +0000 (-0600)
Subject: Fix up return values
X-Git-Tag: v1.2.2~9
X-Git-Url: https://wimlib.net/git/?p=wimlib;a=commitdiff_plain;h=31e7d901124217da4e02717f6b59ee437d15aef3

Fix up return values
---

diff --git a/src/lzx-decompress.c b/src/lzx-decompress.c
index 06e3e020..e0f3b85a 100644
--- a/src/lzx-decompress.c
+++ b/src/lzx-decompress.c
@@ -747,32 +747,32 @@ static int lzx_decompress_block(int block_type, unsigned block_size,
 {
 	unsigned main_element;
 	unsigned end;
+	int ret;
 	int match_len;
-	int ret = 0;
 
 	end = window_pos + block_size;
 	while (window_pos < end) {
 		ret = read_huffsym_using_maintree(istream, tables,
 						  &main_element);
 		if (ret != 0)
-			break;
+			return ret;
 
 		if (main_element < LZX_NUM_CHARS) {
 			/* literal: 0 to LZX_NUM_CHARS - 1 */
 			window[window_pos++] = main_element;
 		} else {
 			/* match: LZX_NUM_CHARS to LZX_MAINTREE_NUM_SYMBOLS - 1 */
-			ret = lzx_decode_match(main_element,
-					       block_type,
-					       end - window_pos,
-					       window,
-					       window_pos,
-					       tables,
-					       queue,
-					       istream);
-			if (ret < 0)
-				break;
-			window_pos += ret;
+			match_len = lzx_decode_match(main_element,
+						     block_type,
+						     end - window_pos,
+						     window,
+						     window_pos,
+						     tables,
+						     queue,
+						     istream);
+			if (match_len < 0)
+				return match_len;
+			window_pos += match_len;
 		}
 	}
 	return 0;
diff --git a/src/xpress-decompress.c b/src/xpress-decompress.c
index 87205543..f2a06033 100644
--- a/src/xpress-decompress.c
+++ b/src/xpress-decompress.c
@@ -88,8 +88,10 @@
  *
  * Note: taking the low 8 bits of the symbol is the same as subtracting 256, the
  * number of symbols reserved for literals.
+ *
+ * Returns the match length, or -1 on error.
  */
-static int xpress_decode_match(int huffsym, unsigned window_pos,
+static int xpress_decode_match(unsigned huffsym, unsigned window_pos,
 			       unsigned window_len, u8 window[],
 			       struct input_bitstream *istream)
 {
@@ -105,23 +107,23 @@ static int xpress_decode_match(int huffsym, unsigned window_pos,
 
 	ret = bitstream_read_bits(istream, offset_bsr, &match_offset);
 	if (ret != 0)
-		return -1;
+		return ret;
 	match_offset |= (1 << offset_bsr);
 
 	if (len_hdr == 0xf) {
 		ret = bitstream_read_byte(istream);
-		if (ret == -1)
-			return -1;
+		if (ret < 0)
+			return ret;
 		match_len = ret;
 		if (match_len == 0xff) {
 			ret = bitstream_read_byte(istream);
-			if (ret == -1)
-				return -1;
+			if (ret < 0)
+				return ret;
 			match_len = ret;
 
 			ret = bitstream_read_byte(istream);
-			if (ret == -1)
-				return -1;
+			if (ret < 0)
+				return ret;
 
 			match_len |= (ret << 8);
 			if (match_len < 0xf)
@@ -162,23 +164,24 @@ static int xpress_decode_match(int huffsym, unsigned window_pos,
 
 /* Decodes the Huffman-encoded matches and literal bytes in a block of
  * XPRESS-encoded data. */
-static int xpress_decompress_literals(struct input_bitstream *istream,
-				      u8 uncompressed_data[],
-				      unsigned uncompressed_len,
-				      const u8 lens[],
-				      const u16 decode_table[])
+static int xpress_decompress_block(struct input_bitstream *istream,
+				   u8 uncompressed_data[],
+				   unsigned uncompressed_len,
+				   const u8 lens[],
+				   const u16 decode_table[])
 {
-	unsigned curpos = 0;
+	unsigned curpos;
 	unsigned huffsym;
+	int ret;
 	int match_len;
-	int ret = 0;
 
+	curpos = 0;
 	while (curpos < uncompressed_len) {
 		ret = read_huffsym(istream, decode_table, lens,
 				   XPRESS_NUM_SYMBOLS, XPRESS_TABLEBITS,
 				   &huffsym, XPRESS_MAX_CODEWORD_LEN);
 		if (ret != 0)
-			break;
+			return ret;
 
 		if (huffsym < XPRESS_NUM_CHARS) {
 			uncompressed_data[curpos++] = huffsym;
@@ -188,14 +191,12 @@ static int xpress_decompress_literals(struct input_bitstream *istream,
 							uncompressed_len,
 							uncompressed_data,
 							istream);
-			if (match_len == -1) {
-				ret = 1;
-				break;
-			}
+			if (match_len < 0)
+				return match_len;
 			curpos += match_len;
 		}
 	}
-	return ret;
+	return 0;
 }
 
 
@@ -221,7 +222,7 @@ int xpress_decompress(const void *__compressed_data, unsigned compressed_len,
 	 * in the first 256 bytes of the compressed data.
 	 */
 	if (compressed_len < XPRESS_NUM_SYMBOLS / 2)
-		return WIMLIB_ERR_DECOMPRESSION;
+		return -1;
 
 	for (i = 0; i < XPRESS_NUM_SYMBOLS / 2; i++) {
 		*lens_p++ = compressed_data[i] & 0xf;
@@ -237,7 +238,7 @@ int xpress_decompress(const void *__compressed_data, unsigned compressed_len,
 	init_input_bitstream(&istream, compressed_data + XPRESS_NUM_SYMBOLS / 2,
 			     compressed_len - XPRESS_NUM_SYMBOLS / 2);
 
-	return xpress_decompress_literals(&istream, uncompressed_data,
-					  uncompressed_len, lens,
-					  decode_table);
+	return xpress_decompress_block(&istream, uncompressed_data,
+				       uncompressed_len, lens,
+				       decode_table);
 }