diff options
| author | Mika Lindqvist <postmaster@raasu.org> | 2016-03-27 15:02:54 +0300 |
|---|---|---|
| committer | Hans Kristian Rosbach <hk-git@circlestorm.org> | 2017-01-30 12:07:06 +0100 |
| commit | f111d5cb4219b7d8a4b8776b4392cc64e0efcd07 (patch) | |
| tree | a81f7236be181d248fbefba5bfa30397ffa6f280 /deflate_fast.c | |
| parent | e80a18b6e9b4d20f1721025f32026e068f6d234b (diff) | |
Merge insert_string and bulk_insert_str.
** Partial merge of this commit, based on a8c94e9f5a3b9d3c62182bcf84e72304a3c1a6e5
Excludes changes to fill_window_sse.c, changes to fill_window_c() in deflate.c
and several unrelated changes in the commit.
Diffstat (limited to 'deflate_fast.c')
| -rw-r--r-- | deflate_fast.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/deflate_fast.c b/deflate_fast.c index 59618a3..c169053 100644 --- a/deflate_fast.c +++ b/deflate_fast.c @@ -39,7 +39,7 @@ block_state deflate_fast(deflate_state *s, int flush) { */ hash_head = NIL; if (s->lookahead >= MIN_MATCH) { - hash_head = insert_string(s, s->strstart); + hash_head = insert_string(s, s->strstart, 1); } /* Find the longest match, discarding those <= prev_length. @@ -68,7 +68,7 @@ block_state deflate_fast(deflate_state *s, int flush) { s->strstart++; #ifdef NOT_TWEAK_COMPILER do { - insert_string(s, s->strstart); + insert_string(s, s->strstart, 1); s->strstart++; /* strstart never exceeds WSIZE-MAX_MATCH, so there are * always MIN_MATCH bytes ahead. @@ -76,7 +76,7 @@ block_state deflate_fast(deflate_state *s, int flush) { } while (--s->match_length != 0); #else { - bulk_insert_str(s, s->strstart, s->match_length); + insert_string(s, s->strstart, s->match_length); s->strstart += s->match_length; s->match_length = 0; } @@ -86,9 +86,9 @@ block_state deflate_fast(deflate_state *s, int flush) { s->match_length = 0; s->ins_h = s->window[s->strstart]; #ifndef NOT_TWEAK_COMPILER - bulk_insert_str(s, s->strstart + 2 - MIN_MATCH, MIN_MATCH - 2); + insert_string(s, s->strstart + 2 - MIN_MATCH, MIN_MATCH - 2); #else - insert_string(s, s->strstart + 2 - MIN_MATCH); + insert_string(s, s->strstart + 2 - MIN_MATCH, 1); #if MIN_MATCH != 3 #warning Call insert_string() MIN_MATCH-3 more times #endif |