X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Flz77.c;h=b5495da74d1599cd59e12cc8ef65c495550eba55;hb=740a1b2d814ec0f6ecaede7f195de468ce757ae9;hp=049b322564e7b4e2cf2fbac1e17efe092411aee4;hpb=157d002da341c9109c5c065893ae82c6dbf5d4e8;p=wimlib diff --git a/src/lz77.c b/src/lz77.c index 049b3225..b5495da7 100644 --- a/src/lz77.c +++ b/src/lz77.c @@ -30,7 +30,7 @@ # include #endif -#include "wimlib/compress.h" +#include "wimlib/compress_common.h" #include "wimlib/util.h" #include @@ -86,18 +86,18 @@ insert_string(input_idx_t hash_tab[], input_idx_t prev_tab[], * @window: The window of uncompressed data. * @bytes_remaining: The number of bytes remaining in the window. * @strstart: The index of the start of the string in the window that - * we are trying to find a match for. + * we are trying to find a match for. * @prev_tab: The array of prev pointers for the hash table. * @cur_match: The index of the head of the hash chain for matches - * having the hash value of the string beginning - * at index @strstart. + * having the hash value of the string beginning + * at index @strstart. * @prev_len: The length of the match that was found for the string - * beginning at (@strstart - 1). + * beginning at (@strstart - 1). * @match_start_ret: A location into which the index of the start of the - * match will be returned. + * match will be returned. * @params: Parameters that affect how long the search will proceed - * before going with the best that has been found - * so far. + * before going with the best that has been found + * so far. * @min_start_pos: If the chain reaches a match starting before this * position (including the end-of-chain 0), the search will * be terminated. @@ -193,18 +193,18 @@ longest_match(const u8 window[], unsigned bytes_remaining, * @record_literal: Consumer for literals. * @record_ctx: Context passed to @record_match and @record_literal. * @params: Structure that contains parameters that affect how the - * analysis proceeds (mainly how good the matches - * have to be). + * analysis proceeds (mainly how good the matches + * have to be). * @prev_tab: Temporary space containing least @window_size elements. */ void -lz_analyze_block(const u8 window[], +lz_analyze_block(const u8 window[restrict], input_idx_t window_size, lz_record_match_t record_match, lz_record_literal_t record_literal, void *record_ctx, const struct lz_params *params, - input_idx_t prev_tab[]) + input_idx_t prev_tab[restrict]) { unsigned cur_input_pos = 0; unsigned hash = 0;