*/
/*
- * Copyright (C) 2012 Eric Biggers
+ * Copyright (C) 2012, 2013 Eric Biggers
*
* This file is part of wimlib, a library for working with WIM files.
*
*/
#include "util.h"
+#include "wimlib.h"
#include "lzx.h"
#include "decompress.h"
#include <string.h>
/*
* Reads a Huffman-encoded symbol using the pre-tree.
*/
-static inline int read_huffsym_using_pretree(struct input_bitstream *istream,
- const u16 pretree_decode_table[],
- const u8 pretree_lens[], unsigned *n)
+static inline int
+read_huffsym_using_pretree(struct input_bitstream *istream,
+ const u16 pretree_decode_table[],
+ const u8 pretree_lens[], unsigned *n)
{
return read_huffsym(istream, pretree_decode_table, pretree_lens,
LZX_PRETREE_NUM_SYMBOLS, LZX_PRETREE_TABLEBITS, n,
}
/* Reads a Huffman-encoded symbol using the main tree. */
-static inline int read_huffsym_using_maintree(struct input_bitstream *istream,
- const struct lzx_tables *tables,
- unsigned *n)
+static inline int
+read_huffsym_using_maintree(struct input_bitstream *istream,
+ const struct lzx_tables *tables,
+ unsigned *n)
{
return read_huffsym(istream, tables->maintree_decode_table,
tables->maintree_lens, LZX_MAINTREE_NUM_SYMBOLS,
}
/* Reads a Huffman-encoded symbol using the length tree. */
-static inline int read_huffsym_using_lentree(struct input_bitstream *istream,
- const struct lzx_tables *tables,
- unsigned *n)
+static inline int
+read_huffsym_using_lentree(struct input_bitstream *istream,
+ const struct lzx_tables *tables,
+ unsigned *n)
{
return read_huffsym(istream, tables->lentree_decode_table,
tables->lentree_lens, LZX_LENTREE_NUM_SYMBOLS,
}
/* Reads a Huffman-encoded symbol using the aligned offset tree. */
-static inline int read_huffsym_using_alignedtree(struct input_bitstream *istream,
- const struct lzx_tables *tables,
- unsigned *n)
+static inline int
+read_huffsym_using_alignedtree(struct input_bitstream *istream,
+ const struct lzx_tables *tables,
+ unsigned *n)
{
return read_huffsym(istream, tables->alignedtree_decode_table,
tables->alignedtree_lens,
* @num_lens: Number of length values to decode and return.
*
*/
-static int lzx_read_code_lens(struct input_bitstream *istream, u8 lens[],
- unsigned num_lens)
+static int
+lzx_read_code_lens(struct input_bitstream *istream, u8 lens[],
+ unsigned num_lens)
{
/* Declare the decoding table and length table for the pretree. */
u16 pretree_decode_table[(1 << LZX_PRETREE_TABLEBITS) +
* R0, R1, and R2 will be written (only for uncompressed
* blocks, which contain this information in the header)
*/
-static int lzx_read_block_header(struct input_bitstream *istream,
- unsigned *block_size_ret,
- unsigned *block_type_ret,
- struct lzx_tables *tables,
- struct lru_queue *queue)
+static int
+lzx_read_block_header(struct input_bitstream *istream,
+ unsigned *block_size_ret,
+ unsigned *block_type_ret,
+ struct lzx_tables *tables,
+ struct lru_queue *queue)
{
int ret;
unsigned block_type;
* - Match refers to data before the window.
* - The input bitstream ended unexpectedly.
*/
-static int lzx_decode_match(unsigned main_element, int block_type,
- unsigned bytes_remaining, u8 *window,
- unsigned window_pos,
- const struct lzx_tables *tables,
- struct lru_queue *queue,
- struct input_bitstream *istream)
+static int
+lzx_decode_match(unsigned main_element, int block_type,
+ unsigned bytes_remaining, u8 *window,
+ unsigned window_pos,
+ const struct lzx_tables *tables,
+ struct lru_queue *queue,
+ struct input_bitstream *istream)
{
unsigned length_header;
unsigned position_slot;
return match_len;
}
-static void undo_call_insn_translation(u32 *call_insn_target, int input_pos,
- int32_t file_size)
+static void
+undo_call_insn_translation(u32 *call_insn_target, int input_pos,
+ int32_t file_size)
{
int32_t abs_offset;
int32_t rel_offset;
* Call instruction processing is supposed to take the file size as a parameter,
* as it is used in calculating the translated jump targets. But in WIM files,
* this file size is always the same (LZX_WIM_MAGIC_FILESIZE == 12000000).*/
-static void undo_call_insn_preprocessing(u8 uncompressed_data[],
- int uncompressed_data_len)
+static void
+undo_call_insn_preprocessing(u8 uncompressed_data[], int uncompressed_data_len)
{
for (int i = 0; i < uncompressed_data_len - 10; i++) {
if (uncompressed_data[i] == 0xe8) {
* @queue: The least-recently-used queue for match offsets.
* @istream: The input bitstream for the compressed literals.
*/
-static int lzx_decompress_block(int block_type, unsigned block_size,
- u8 *window,
- unsigned window_pos,
- const struct lzx_tables *tables,
- struct lru_queue *queue,
- struct input_bitstream *istream)
+static int
+lzx_decompress_block(int block_type, unsigned block_size,
+ u8 *window,
+ unsigned window_pos,
+ const struct lzx_tables *tables,
+ struct lru_queue *queue,
+ struct input_bitstream *istream)
{
unsigned main_element;
unsigned end;
return 0;
}
-/*
- * Decompresses a block of LZX-compressed data as used in the WIM file format.
- *
- * Note that this will NOT work unmodified for LZX as used in the cabinet
- * format, which is not the same as in the WIM format!
- *
- * @compressed_data: A pointer to the compressed data.
- *
- * @compressed_len: The length of the compressed data, in bytes.
- *
- * @uncompressed_data: A pointer to the buffer into which to write the
- * uncompressed data.
- *
- * @uncompressed_len: The length of the uncompressed data. It must be
- * 32768 bytes or less.
- *
- * Return 0 on success; non-zero on failure.
- */
-int lzx_decompress(const void *compressed_data, unsigned compressed_len,
- void *uncompressed_data, unsigned uncompressed_len)
+/* Documented in wimlib.h */
+WIMLIBAPI int
+wimlib_lzx_decompress(const void *compressed_data, unsigned compressed_len,
+ void *uncompressed_data, unsigned uncompressed_len)
{
struct lzx_tables tables;
struct input_bitstream istream;