update_image.c: Remove update1()

[wimlib] / src / xpress-decompress.c

diff --git a/src/xpress-decompress.c b/src/xpress-decompress.c
index ebe0d23b73d6c1eccf23c9b4ee023d0172a13b3d..8d7741090dbae4519f9c97ccfb43c77836110b10 100644 (file)
--- a/src/xpress-decompress.c
+++ b/src/xpress-decompress.c
@@ -71,6 +71,7 @@
 
 #include "wimlib/decompressor_ops.h"
 #include "wimlib/decompress_common.h"
+#include "wimlib/error.h"
 #include "wimlib/xpress.h"
 
 /*
@@ -141,8 +142,6 @@ xpress_lz_decode(struct input_bitstream * restrict istream,
                unsigned sym;
                int ret;
 
-               bitstream_ensure_bits(istream, 16);
-
                sym = read_huffsym(istream, decode_table,
                                   XPRESS_TABLEBITS, XPRESS_MAX_CODEWORD_LEN);
                if (sym < XPRESS_NUM_CHARS) {
@@ -200,6 +199,16 @@ xpress_decompress(const void *compressed_data, size_t compressed_size,
                                uncompressed_size, decode_table);
 }
 
+static int
+xpress_create_decompressor(size_t max_block_size, void **dec_ret)
+{
+       if (max_block_size > XPRESS_MAX_OFFSET + 1)
+               return WIMLIB_ERR_INVALID_PARAM;
+
+       return 0;
+}
+
 const struct decompressor_ops xpress_decompressor_ops = {
-       .decompress = xpress_decompress,
+       .create_decompressor = xpress_create_decompressor,
+       .decompress          = xpress_decompress,
 };