From: Yann Collet <cyan@fb.com>
Date: Wed, 9 May 2018 19:07:25 +0000 (-0700)
Subject: fixed declaration-after-statement warning
X-Git-Tag: v1.3.5~3^2~55^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c39061cb7bef5074f0026e71afdbb89ea0f368c4;p=thirdparty%2Fzstd.git

fixed declaration-after-statement warning
---

diff --git a/lib/common/fse.h b/lib/common/fse.h
index 8e44c1a44..864212743 100644
--- a/lib/common/fse.h
+++ b/lib/common/fse.h
@@ -582,20 +582,22 @@ MEM_STATIC U32 FSE_getMaxNbBits(const FSE_symbolCompressionTransform* symbolTT,
 
 /* FSE_bitCost_b256() :
  * Approximate symbol cost,
- * provide fractional value, using fixed-point format (accuracyLog fractional bits) */
+ * provide fractional value, using fixed-point format (accuracyLog fractional bits)
+ * note: assume symbolValue is valid */
 MEM_STATIC U32 FSE_bitCost(const FSE_symbolCompressionTransform* symbolTT, U32 tableLog, U32 symbolValue, U32 accuracyLog)
 {
     U32 const minNbBits = symbolTT[symbolValue].deltaNbBits >> 16;
     U32 const threshold = (minNbBits+1) << 16;
     assert(tableLog < 16);
-    U32 const tableSize = 1 << tableLog;
-    assert(symbolTT[symbolValue].deltaNbBits + tableSize <= threshold);
-    U32 const deltaFromThreshold = threshold - (symbolTT[symbolValue].deltaNbBits + tableSize);
     assert(accuracyLog < 31-tableLog);  /* ensure enough room for renormalization double shift */
-    U32 const normalizedDeltaFromThreshold = (deltaFromThreshold << accuracyLog) >> tableLog;   /* linear interpolation (very approximate) */
-    U32 const bitMultiplier = 1 << accuracyLog;
-    assert(normalizedDeltaFromThreshold <= bitMultiplier);
-    return (minNbBits+1)*bitMultiplier - normalizedDeltaFromThreshold;
+    {   U32 const tableSize = 1 << tableLog;
+        assert(symbolTT[symbolValue].deltaNbBits + tableSize <= threshold);
+        {   U32 const deltaFromThreshold = threshold - (symbolTT[symbolValue].deltaNbBits + tableSize);
+            U32 const normalizedDeltaFromThreshold = (deltaFromThreshold << accuracyLog) >> tableLog;   /* linear interpolation (very approximate) */
+            U32 const bitMultiplier = 1 << accuracyLog;
+            assert(normalizedDeltaFromThreshold <= bitMultiplier);
+            return (minNbBits+1)*bitMultiplier - normalizedDeltaFromThreshold;
+    }   }
 }
 
 
diff --git a/lib/compress/zstd_opt.c b/lib/compress/zstd_opt.c
index 67db85eb9..73ecda721 100644
--- a/lib/compress/zstd_opt.c
+++ b/lib/compress/zstd_opt.c
@@ -135,10 +135,10 @@ static U32 ZSTD_litLengthPrice(U32 const litLength, const optState_t* const optP
         U32 const llCode = ZSTD_LLcode(litLength);
         FSE_CState_t cstate;
         FSE_initCState(&cstate, optPtr->symbolCosts->litlengthCTable);
-        U32 const price = LL_bits[llCode]*BITCOST_MULTIPLIER + BITCOST_SYMBOL(cstate.symbolTT, cstate.stateLog, llCode);
-        DEBUGLOG(8, "ZSTD_litLengthPrice: ll=%u, bitCost=%.2f", litLength, (double)price / BITCOST_MULTIPLIER);
-        return price;
-    }
+        {   U32 const price = LL_bits[llCode]*BITCOST_MULTIPLIER + BITCOST_SYMBOL(cstate.symbolTT, cstate.stateLog, llCode);
+            DEBUGLOG(8, "ZSTD_litLengthPrice: ll=%u, bitCost=%.2f", litLength, (double)price / BITCOST_MULTIPLIER);
+            return price;
+    }   }
     if (optPtr->priceType == zop_predef) return ZSTD_highbit32((U32)litLength+1);
 
     /* dynamic statistics */