bt_matchfinder: remove unnecessary max_len parameter to skip routine

[wimlib] / include / wimlib / bt_matchfinder.h

diff --git a/include/wimlib/bt_matchfinder.h b/include/wimlib/bt_matchfinder.h
index e1a8295c40473ab7c8e73015dc0f0cd4670956a4..39a2778b7d20971a37913d981c8e02085ca4cc4f 100644 (file)
--- a/include/wimlib/bt_matchfinder.h
+++ b/include/wimlib/bt_matchfinder.h
@@ -1,11 +1,21 @@
 /*
 /*

- * bt_matchfinder.h
+ * bt_matchfinder.h - Lempel-Ziv matchfinding with a hash table of binary trees

  *
  *

- * Author:     Eric Biggers
- * Year:       2014, 2015
+ * The following copying information applies to this specific source code file:

  *
  *

- * The author dedicates this file to the public domain.
- * You can do whatever you want with this file.
+ * Written in 2014-2016 by Eric Biggers <ebiggers3@gmail.com>
+ *
+ * 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
+ * worldwide via the Creative Commons Zero 1.0 Universal Public Domain
+ * Dedication (the "CC0").
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the CC0 for more details.
+ *
+ * You should have received a copy of the CC0 along with this software; if not
+ * see <http://creativecommons.org/publicdomain/zero/1.0/>.

  *
  * ----------------------------------------------------------------------------
  *
  *
  * ----------------------------------------------------------------------------
  *


@@ -234,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]) {
                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;
                        if (!record_matches || len > best_len) {
                                if (record_matches) {
                                        best_len = len;


@@ -347,7 +356,6 @@ static inline void
 TEMPLATED(bt_matchfinder_skip_position)(struct TEMPLATED(bt_matchfinder) *mf,
                                        const u8 *in_begin,
                                        ptrdiff_t cur_pos,
 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])
                                        u32 nice_len,
                                        u32 max_search_depth,
                                        u32 next_hashes[static 2])


@@ -356,7 +364,7 @@ TEMPLATED(bt_matchfinder_skip_position)(struct TEMPLATED(bt_matchfinder) *mf,
        TEMPLATED(bt_matchfinder_advance_one_byte)(mf,
                                                   in_begin,
                                                   cur_pos,
        TEMPLATED(bt_matchfinder_advance_one_byte)(mf,
                                                   in_begin,
                                                   cur_pos,

-                                                  max_len,
+                                                  nice_len,

                                                   nice_len,
                                                   max_search_depth,
                                                   next_hashes,
                                                   nice_len,
                                                   max_search_depth,
                                                   next_hashes,