From: W. Felix Handte <w@felixhandte.com>
Date: Wed, 8 Sep 2021 20:47:26 +0000 (-0400)
Subject: Nit: Unnest Blocks that Don't Declare Anything
X-Git-Tag: v1.5.1~1^2~77^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47fd762eccb3d8273a8e9c20239fd069271c3d0d;p=thirdparty%2Fzstd.git

Nit: Unnest Blocks that Don't Declare Anything
---

diff --git a/lib/compress/zstd_double_fast.c b/lib/compress/zstd_double_fast.c
index a85d68f01..3a579e76d 100644
--- a/lib/compress/zstd_double_fast.c
+++ b/lib/compress/zstd_double_fast.c
@@ -184,26 +184,22 @@ _cleanup:
     return (size_t)(iend - anchor);
 
 _search_next_long:
-    {
 
-        /* check prefix long +1 match */
-        if (idxl1 > prefixLowestIndex) {
-            if (MEM_read64(matchl1) == MEM_read64(ip1)) {
-                ip = ip1;
-                mLength = ZSTD_count(ip+8, matchl1+8, iend) + 8;
-                offset = (U32)(ip-matchl1);
-                while (((ip>anchor) & (matchl1>prefixLowest)) && (ip[-1] == matchl1[-1])) { ip--; matchl1--; mLength++; } /* catch up */
-                goto _match_found;
-            }
+    /* check prefix long +1 match */
+    if (idxl1 > prefixLowestIndex) {
+        if (MEM_read64(matchl1) == MEM_read64(ip1)) {
+            ip = ip1;
+            mLength = ZSTD_count(ip+8, matchl1+8, iend) + 8;
+            offset = (U32)(ip-matchl1);
+            while (((ip>anchor) & (matchl1>prefixLowest)) && (ip[-1] == matchl1[-1])) { ip--; matchl1--; mLength++; } /* catch up */
+            goto _match_found;
         }
     }
 
     /* if no long +1 match, explore the short match we found */
-    {
-        mLength = ZSTD_count(ip+4, matchs0+4, iend) + 4;
-        offset = (U32)(ip - matchs0);
-        while (((ip>anchor) & (matchs0>prefixLowest)) && (ip[-1] == matchs0[-1])) { ip--; matchs0--; mLength++; } /* catch up */
-    }
+    mLength = ZSTD_count(ip+4, matchs0+4, iend) + 4;
+    offset = (U32)(ip - matchs0);
+    while (((ip>anchor) & (matchs0>prefixLowest)) && (ip[-1] == matchs0[-1])) { ip--; matchs0--; mLength++; } /* catch up */
 
     /* fall-through */