Cleanups from recent changes

[wimlib] / src / lz_binary_trees.c

diff --git a/src/lz_binary_trees.c b/src/lz_binary_trees.c
index aef7b8908ff98658dbd5a9fdb4d24aa86b94d22f..fa866b89e7c71a6d7d5117478b7bf163afb5dbcd 100644 (file)
--- a/src/lz_binary_trees.c
+++ b/src/lz_binary_trees.c
@@ -81,7 +81,7 @@ lz_bt_set_default_params(struct lz_mf_params *params)
                params->min_match_len = 2;
 
        if (params->max_match_len == 0)
-               params->max_match_len = params->max_window_size;
+               params->max_match_len = UINT32_MAX;
 
        if (params->max_search_depth == 0)
                params->max_search_depth = 50;
@@ -437,7 +437,7 @@ lz_bt_get_matches(struct lz_mf *_mf, struct lz_match matches[])
                /* Search the digram table for a length 2 match.  */
 
                const u16 digram = mf->next_digram;
-               mf->next_digram = *(const u16 *)(&window[cur_pos + 1]);
+               mf->next_digram = load_u16_unaligned(&window[cur_pos + 1]);
                prefetch(&mf->digram_tab[mf->next_digram]);
                cur_match = mf->digram_tab[digram];
                mf->digram_tab[digram] = cur_pos;
@@ -563,7 +563,7 @@ lz_bt_skip_positions(struct lz_mf *_mf, u32 n)
        do {
                if (mf->digram_tab) {
                        digram = next_digram;
-                       next_digram = *(const u16 *)(&window[cur_pos + 1]);
+                       next_digram = load_u16_unaligned(&window[cur_pos + 1]);
                        mf->digram_tab[digram] = cur_pos;
                }