From 993d197cac3a09508f2afefe0e2a620d7e43fa1a Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Tue, 21 Jun 2016 20:01:58 -0500 Subject: [PATCH 1/1] bt_matchfinder: remove unnecessary max_len parameter to skip routine --- include/wimlib/bt_matchfinder.h | 8 +++----- src/lzx_compress.c | 1 - src/xpress_compress.c | 1 - 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/include/wimlib/bt_matchfinder.h b/include/wimlib/bt_matchfinder.h index 6a2e7edf..39a2778b 100644 --- a/include/wimlib/bt_matchfinder.h +++ b/include/wimlib/bt_matchfinder.h @@ -3,7 +3,7 @@ * * The following copying information applies to this specific source code file: * - * Written in 2014-2015 by Eric Biggers + * Written in 2014-2016 by Eric Biggers * * To the extent possible under law, the author(s) have dedicated all copyright * and related and neighboring rights to this software to the public domain @@ -244,8 +244,7 @@ TEMPLATED(bt_matchfinder_advance_one_byte)(struct TEMPLATED(bt_matchfinder) * co matchptr = &in_begin[cur_node]; if (matchptr[len] == in_next[len]) { - len = lz_extend(in_next, matchptr, len + 1, - (record_matches ? max_len : nice_len)); + len = lz_extend(in_next, matchptr, len + 1, max_len); if (!record_matches || len > best_len) { if (record_matches) { best_len = len; @@ -357,7 +356,6 @@ static inline void TEMPLATED(bt_matchfinder_skip_position)(struct TEMPLATED(bt_matchfinder) *mf, const u8 *in_begin, ptrdiff_t cur_pos, - u32 max_len, u32 nice_len, u32 max_search_depth, u32 next_hashes[static 2]) @@ -366,7 +364,7 @@ TEMPLATED(bt_matchfinder_skip_position)(struct TEMPLATED(bt_matchfinder) *mf, TEMPLATED(bt_matchfinder_advance_one_byte)(mf, in_begin, cur_pos, - max_len, + nice_len, nice_len, max_search_depth, next_hashes, diff --git a/src/lzx_compress.c b/src/lzx_compress.c index 6a631db9..19e2daa2 100644 --- a/src/lzx_compress.c +++ b/src/lzx_compress.c @@ -1883,7 +1883,6 @@ lzx_compress_near_optimal(struct lzx_compressor *c, bt_matchfinder_skip_position, in_begin, in_next - in_begin, - max_len, nice_len, c->max_search_depth, next_hashes); diff --git a/src/xpress_compress.c b/src/xpress_compress.c index edc126d9..d8cb7697 100644 --- a/src/xpress_compress.c +++ b/src/xpress_compress.c @@ -964,7 +964,6 @@ xpress_find_matches(struct xpress_compressor * restrict c, bt_matchfinder_skip_position(&c->bt_mf, in_begin, in_next - in_begin, - max_len, nice_len, c->max_search_depth, next_hashes); -- 2.43.0