diff options
| author | Hans Kristian Rosbach <hk-git@circlestorm.org> | 2017-01-30 13:18:07 +0100 |
|---|---|---|
| committer | Hans Kristian Rosbach <hk-git@circlestorm.org> | 2017-01-30 13:18:07 +0100 |
| commit | 317e8824c90445366e156a61d7bf57631169e30e (patch) | |
| tree | 2584feed982e9ef7a1ee257db12df8c3d982d753 /deflate_medium.c | |
| parent | f111d5cb4219b7d8a4b8776b4392cc64e0efcd07 (diff) | |
Fix missing insert_string change from merge conflict
Diffstat (limited to 'deflate_medium.c')
| -rw-r--r-- | deflate_medium.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/deflate_medium.c b/deflate_medium.c index 26a12eb..82301d1 100644 --- a/deflate_medium.c +++ b/deflate_medium.c @@ -75,7 +75,7 @@ static void insert_match(deflate_state *s, struct match match) { match.strstart++; match.match_length--; if (match.strstart >= match.orgstart) { - bulk_insert_str(s, match.strstart, match.match_length); + insert_string(s, match.strstart, match.match_length); } match.strstart += match.match_length; match.match_length = 0; @@ -102,7 +102,7 @@ static void insert_match(deflate_state *s, struct match match) { } while (--match.match_length != 0); #else if (likely(match.strstart >= match.orgstart)) { - bulk_insert_str(s, match.strstart, match.match_length); + insert_string(s, match.strstart, match.match_length); } match.strstart += match.match_length; match.match_length = 0; |