Rename raw_match => lz_match

[wimlib] / src / xpress-compress.c

diff --git a/src/xpress-compress.c b/src/xpress-compress.c
index 175534c0c7a38e5aba180b98a012961204fe4d1f..228ac51e623b166aeeb58d653b746d881c9d6e3c 100644 (file)
--- a/src/xpress-compress.c
+++ b/src/xpress-compress.c
@@ -38,10 +38,6 @@
 #include "wimlib/util.h"
 #include "wimlib/xpress.h"
 
-#ifdef HAVE_ALLOCA_H
-#  include <alloca.h>
-#endif
-#include <stdlib.h>
 #include <string.h>
 
 struct xpress_record_ctx {
@@ -54,7 +50,7 @@ struct xpress_compressor {
        u32 max_window_size;
        struct xpress_match *matches;
        input_idx_t *prev_tab;
-       u16 codewords[XPRESS_NUM_SYMBOLS];
+       u32 codewords[XPRESS_NUM_SYMBOLS];
        u8 lens[XPRESS_NUM_SYMBOLS];
        struct xpress_record_ctx record_ctx;
 };
@@ -75,7 +71,7 @@ struct xpress_match {
 static void
 xpress_write_match(struct xpress_match match,
                   struct output_bitstream *restrict ostream,
-                  const u16 codewords[restrict],
+                  const u32 codewords[restrict],
                   const u8 lens[restrict])
 {
        u8 len_hdr = min(match.adjusted_len, 0xf);
@@ -99,7 +95,7 @@ static void
 xpress_write_matches_and_literals(struct output_bitstream *ostream,
                                  const struct xpress_match matches[restrict],
                                  input_idx_t num_matches,
-                                 const u16 codewords[restrict],
+                                 const u32 codewords[restrict],
                                  const u8 lens[restrict])
 {
        for (input_idx_t i = 0; i < num_matches; i++) {