]> git.ipfire.org Git - thirdparty/zlib-ng.git/commitdiff
Fix missing insert_string change from merge conflict
authorHans Kristian Rosbach <hk-git@circlestorm.org>
Mon, 30 Jan 2017 12:18:07 +0000 (13:18 +0100)
committerHans Kristian Rosbach <hk-git@circlestorm.org>
Mon, 30 Jan 2017 12:18:07 +0000 (13:18 +0100)
deflate_medium.c

index 26a12ebdaa54553a68ead7762ae78aa7cfccebbe..82301d1c4472be6e855837745469265942f927cf 100644 (file)
@@ -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;