From: Hans Kristian Rosbach <hk-git@circlestorm.org>
Date: Mon, 30 Jan 2017 12:18:07 +0000 (+0100)
Subject: Fix missing insert_string change from merge conflict
X-Git-Tag: 1.9.9-b1~760
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=317e8824c90445366e156a61d7bf57631169e30e;p=thirdparty%2Fzlib-ng.git

Fix missing insert_string change from merge conflict
---

diff --git a/deflate_medium.c b/deflate_medium.c
index 26a12ebda..82301d1c4 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;