gzip cleanup part #7

This commit is contained in:
Denis Vlasenko 2007-01-07 19:39:54 +00:00
parent 1a03c21adf
commit ef87d46b8c

View File

@ -616,9 +616,11 @@ static void copy_block(char *buf, unsigned len, int header)
* (except for the last MIN_MATCH-1 bytes of the input file). * (except for the last MIN_MATCH-1 bytes of the input file).
*/ */
#define INSERT_STRING(s, match_head) \ #define INSERT_STRING(s, match_head) \
(UPDATE_HASH(ins_h, window[(s) + MIN_MATCH-1]), \ { \
prev[(s) & WMASK] = match_head = head[ins_h], \ UPDATE_HASH(ins_h, window[(s) + MIN_MATCH-1]); \
head[ins_h] = (s)) prev[(s) & WMASK] = match_head = head[ins_h]; \
head[ins_h] = (s); \
}
/* =========================================================================== /* ===========================================================================
* Initialize the "longest match" routines for a new file * Initialize the "longest match" routines for a new file
@ -898,9 +900,7 @@ static ulg deflate(void)
* match is not better, output the previous match: * match is not better, output the previous match:
*/ */
if (prev_length >= MIN_MATCH && match_length <= prev_length) { if (prev_length >= MIN_MATCH && match_length <= prev_length) {
check_match(strstart - 1, prev_match, prev_length); check_match(strstart - 1, prev_match, prev_length);
flush = ct_tally(strstart - 1 - prev_match, prev_length - MIN_MATCH); flush = ct_tally(strstart - 1 - prev_match, prev_length - MIN_MATCH);
/* Insert in hash table all strings up to the end of the match. /* Insert in hash table all strings up to the end of the match.