X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fxpress-compress.c;h=6d2836f050e6b3b02f86c3b0b3c6410a2324d292;hb=a3bb2e86f2640f5d593d00250a627d3dcc9747a2;hp=d131ada5d277038e564b929c0c514c302caf9f31;hpb=d66b5c805c4e9a660bac6f979d88c1820cb031f2;p=wimlib diff --git a/src/xpress-compress.c b/src/xpress-compress.c index d131ada5..6d2836f0 100644 --- a/src/xpress-compress.c +++ b/src/xpress-compress.c @@ -7,7 +7,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. * @@ -36,8 +36,9 @@ * * @codewords and @lens provide the Huffman code that is being used. */ -static int xpress_write_match(struct output_bitstream *ostream, u32 match, - const u16 codewords[], const u8 lens[]) +static int +xpress_write_match(struct output_bitstream *ostream, u32 match, + const u16 codewords[], const u8 lens[]) { u32 adjusted_match_len = match & 0xffff; u32 match_offset = match >> 16; @@ -65,11 +66,12 @@ static int xpress_write_match(struct output_bitstream *ostream, u32 match, match_offset ^ (1 << offset_bsr), offset_bsr); } -static int xpress_write_compressed_literals(struct output_bitstream *ostream, - const u32 match_tab[], - unsigned num_matches, - const u16 codewords[], - const u8 lens[]) +static int +xpress_write_compressed_literals(struct output_bitstream *ostream, + const u32 match_tab[], + unsigned num_matches, + const u16 codewords[], + const u8 lens[]) { for (unsigned i = 0; i < num_matches; i++) { int ret; @@ -88,15 +90,17 @@ static int xpress_write_compressed_literals(struct output_bitstream *ostream, lens[XPRESS_END_OF_DATA]); } -static u32 xpress_record_literal(u8 literal, void *__freq_tab) +static u32 +xpress_record_literal(u8 literal, void *__freq_tab) { freq_t *freq_tab = __freq_tab; freq_tab[literal]++; return literal; } -static u32 xpress_record_match(unsigned match_offset, unsigned match_len, - void *freq_tab, void *ignore) +static u32 +xpress_record_match(unsigned match_offset, unsigned match_len, + void *freq_tab, void *ignore) { wimlib_assert(match_len >= XPRESS_MIN_MATCH && match_len <= XPRESS_MAX_MATCH); @@ -152,8 +156,9 @@ static const struct lz_params xpress_lz_params = { * not reduce its size, and @compressed_data will not contain the full * compressed data. */ -int xpress_compress(const void *__uncompressed_data, unsigned uncompressed_len, - void *__compressed_data, unsigned *compressed_len_ret) +int +xpress_compress(const void *__uncompressed_data, unsigned uncompressed_len, + void *__compressed_data, unsigned *compressed_len_ret) { const u8 *uncompressed_data = __uncompressed_data; u8 *compressed_data = __compressed_data;