Replace num_fast_bytes => nice_match_length

There is no binary tree match-finder anymore, so 'nice_match_length'
makes more sense.

diff --git a/include/wimlib.h b/include/wimlib.h
index 0fc5fb9fd4e77ce5e6d7443038dc59b40b7f9e7b..c0aaf13bf2f46bb103976c7a0d2c2adb08e5b1dd 100644 (file)
--- a/include/wimlib.h
+++ b/include/wimlib.h
@@ -4014,10 +4014,11 @@ struct wimlib_lzx_compressor_params {
 
                        uint32_t slow_reserved1 : 31;
 
-                       /** Matches with length (in bytes) longer than this
-                        * value are immediately taken without spending time on
-                        * minimum-cost measurements.  Suggested value: 32.  */
-                       uint32_t num_fast_bytes;
+                       /** Matches with length (in bytes) greater than or equal
+                        * to this value are immediately taken without spending
+                        * time on minimum-cost measurements.  Suggested value:
+                        * 32.  */
+                       uint32_t nice_match_length;
 
                        /** Number of passes to compute a match/literal sequence
                         * for each LZX block.  This is for an iterative

diff --git a/programs/imagex.c b/programs/imagex.c
index d64f2e04d62ca19d9c5bfe00cda192683b8cca3f..0a0934d97a135078405f7aed5680b526956af287 100644 (file)
--- a/programs/imagex.c
+++ b/programs/imagex.c
@@ -446,7 +446,7 @@ set_compress_slow(void)
                .alg_params = {
                        .slow = {
                                .use_len2_matches = 1,
-                               .num_fast_bytes = 96,
+                               .nice_match_length = 96,
                                .num_optim_passes = 4,
                                .max_search_depth = 100,
                                .max_matches_per_pos = 10,

diff --git a/src/lzx-compress.c b/src/lzx-compress.c
index ae4bfa727afe7e1beedd8852b71345dbbc89ce29..2cce4441708e5027632ac60c2226a3d56ee5df68 100644 (file)
--- a/src/lzx-compress.c
+++ b/src/lzx-compress.c
@@ -1675,7 +1675,7 @@ lzx_create_compressor(size_t window_size,
                .alg_params = {
                        .slow = {
                                .use_len2_matches = 1,
-                               .num_fast_bytes = 32,
+                               .nice_match_length = 32,
                                .num_optim_passes = 2,
                                .max_search_depth = 50,
                                .max_matches_per_pos = 3,
@@ -1741,7 +1741,7 @@ lzx_create_compressor(size_t window_size,
        if (params->algorithm == WIMLIB_LZX_ALGORITHM_SLOW) {
                if (!lz_match_chooser_init(&ctx->mc,
                                           LZX_OPTIM_ARRAY_SIZE,
-                                          params->alg_params.slow.num_fast_bytes,
+                                          params->alg_params.slow.nice_match_length,
                                           LZX_MAX_MATCH_LEN))
                        goto oom;
        }