From: Hans Kristian Rosbach <hk-git@circlestorm.org>
Date: Fri, 26 Jun 2015 13:22:36 +0000 (+0200)
Subject: Make bulk_insert implementation of insert_match behave more like
X-Git-Tag: 1.9.9-b1~796^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d91b4ae5a684fcdb6cdd2e7315ec80efb7df064;p=thirdparty%2Fzlib-ng.git

Make bulk_insert implementation of insert_match behave more like
the original code, this also lets us optimize the match_length=1 case.
---

diff --git a/deflate_medium.c b/deflate_medium.c
index 995a2cb97..0c724b9e8 100644
--- a/deflate_medium.c
+++ b/deflate_medium.c
@@ -69,9 +69,12 @@ static void insert_match(deflate_state *s, struct match match) {
                     }
             }
 #else
-            match.strstart++;
-            match.match_length--;
-            if (match.match_length > 0) {
+            if (likely(match.match_length == 1)) {
+                match.strstart++;
+                match.match_length = 0;
+            }else{
+                match.strstart++;
+                match.match_length--;
                 if (match.strstart >= match.orgstart) {
                     bulk_insert_str(s, match.strstart, match.match_length);
                 }