X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fxpress-decompress.c;h=bf2faa1a8ec412f7a7781543df2247d7f6b3f5ac;hp=f2a0603370ec94f68a2386e051f1d2052c879351;hb=2e44f90c21db693058037f83f92ad136c818ce9d;hpb=31e7d901124217da4e02717f6b59ee437d15aef3

diff --git a/src/xpress-decompress.c b/src/xpress-decompress.c
index f2a06033..bf2faa1a 100644
--- a/src/xpress-decompress.c
+++ b/src/xpress-decompress.c
@@ -6,7 +6,7 @@
 
 /*
  *
- * Copyright (C) 2012 Eric Biggers
+ * Copyright (C) 2012, 2013 Eric Biggers
  *
  * This file is part of wimlib, a library for working with WIM files.
  *
@@ -71,12 +71,16 @@
  * extra symbol is there or not.
  */
 
-#include "util.h"
-#include "xpress.h"
-#include "wimlib.h"
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
+#include "wimlib.h"
+#include "wimlib/assert.h"
 #define XPRESS_DECOMP
-#include "decompress.h"
+#include "wimlib/decompress.h"
+#include "wimlib/util.h"
+#include "wimlib/xpress.h"
 
 /*
  * Decodes a symbol @huffsym that begins an XPRESS match.
@@ -91,9 +95,10 @@
  *
  * Returns the match length, or -1 on error.
  */
-static int xpress_decode_match(unsigned huffsym, unsigned window_pos,
-			       unsigned window_len, u8 window[],
-			       struct input_bitstream *istream)
+static int
+xpress_decode_match(unsigned huffsym, unsigned window_pos,
+		    unsigned window_len, u8 window[restrict],
+		    struct input_bitstream * restrict istream)
 {
 	unsigned match_len;
 	unsigned match_offset;
@@ -106,7 +111,7 @@ static int xpress_decode_match(unsigned huffsym, unsigned window_pos,
 	unsigned i;
 
 	ret = bitstream_read_bits(istream, offset_bsr, &match_offset);
-	if (ret != 0)
+	if (ret)
 		return ret;
 	match_offset |= (1 << offset_bsr);
 
@@ -126,8 +131,6 @@ static int xpress_decode_match(unsigned huffsym, unsigned window_pos,
 				return ret;
 
 			match_len |= (ret << 8);
-			if (match_len < 0xf)
-				return -1;
 		} else {
 			match_len += 0xf;
 		}
@@ -144,15 +147,15 @@ static int xpress_decode_match(unsigned huffsym, unsigned window_pos,
 	match_src = match_dest - match_offset;
 
 	if (window_pos + match_len > window_len) {
-		ERROR("XPRESS decompression error: match of length %d "
+		ERROR("XPRESS decompression error: match of length %u "
 		      "bytes overflows window", match_len);
 		return -1;
 	}
 
 	if (match_src < window) {
-		ERROR("XPRESS decompression error: match of length %d bytes "
-		      "references data before window (match_offset = %d, "
-		      "window_pos = %d)", match_len, match_offset, window_pos);
+		ERROR("XPRESS decompression error: match of length %u bytes "
+		      "references data before window (match_offset = %u, "
+		      "window_pos = %u)", match_len, match_offset, window_pos);
 		return -1;
 	}
 
@@ -164,11 +167,12 @@ static int xpress_decode_match(unsigned huffsym, unsigned window_pos,
 
 /* Decodes the Huffman-encoded matches and literal bytes in a block of
  * XPRESS-encoded data. */
-static int xpress_decompress_block(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 * restrict istream,
+			u8 uncompressed_data[restrict],
+			unsigned uncompressed_len,
+			const u8 lens[restrict],
+			const u16 decode_table[restrict])
 {
 	unsigned curpos;
 	unsigned huffsym;
@@ -180,7 +184,7 @@ static int xpress_decompress_block(struct input_bitstream *istream,
 		ret = read_huffsym(istream, decode_table, lens,
 				   XPRESS_NUM_SYMBOLS, XPRESS_TABLEBITS,
 				   &huffsym, XPRESS_MAX_CODEWORD_LEN);
-		if (ret != 0)
+		if (ret)
 			return ret;
 
 		if (huffsym < XPRESS_NUM_CHARS) {
@@ -200,8 +204,10 @@ static int xpress_decompress_block(struct input_bitstream *istream,
 }
 
 
-int xpress_decompress(const void *__compressed_data, unsigned compressed_len,
-		      void *uncompressed_data, unsigned uncompressed_len)
+/* Documented in wimlib.h */
+WIMLIBAPI int
+wimlib_xpress_decompress(const void * restrict _compressed_data, unsigned compressed_len,
+			 void * restrict uncompressed_data, unsigned uncompressed_len)
 {
 	u8 lens[XPRESS_NUM_SYMBOLS];
 	u16 decode_table[(1 << XPRESS_TABLEBITS) + 2 * XPRESS_NUM_SYMBOLS];
@@ -211,7 +217,7 @@ int xpress_decompress(const void *__compressed_data, unsigned compressed_len,
 	unsigned i;
 	int ret;
 
-	compressed_data = __compressed_data;
+	compressed_data = _compressed_data;
 	lens_p = lens;
 
 	DEBUG2("compressed_len = %d, uncompressed_len = %d",
@@ -221,8 +227,10 @@ int xpress_decompress(const void *__compressed_data, unsigned compressed_len,
 	 * code lengths of these symbols are given literally as 4-bit integers
 	 * in the first 256 bytes of the compressed data.
 	 */
-	if (compressed_len < XPRESS_NUM_SYMBOLS / 2)
+	if (compressed_len < XPRESS_NUM_SYMBOLS / 2) {
+		ERROR("xpress_decompress(): Compressed length too short!");
 		return -1;
+	}
 
 	for (i = 0; i < XPRESS_NUM_SYMBOLS / 2; i++) {
 		*lens_p++ = compressed_data[i] & 0xf;
@@ -232,7 +240,7 @@ int xpress_decompress(const void *__compressed_data, unsigned compressed_len,
 	ret = make_huffman_decode_table(decode_table, XPRESS_NUM_SYMBOLS,
 					XPRESS_TABLEBITS, lens,
 					XPRESS_MAX_CODEWORD_LEN);
-	if (ret != 0)
+	if (ret)
 		return ret;
 
 	init_input_bitstream(&istream, compressed_data + XPRESS_NUM_SYMBOLS / 2,