From: Yann Collet <yann.collet.73@gmail.com>
Date: Mon, 21 Mar 2016 13:22:38 +0000 (+0100)
Subject: minor variable isolation
X-Git-Tag: v0.6.0^2~17^2~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e91477c1716987479e10201c5f50d0f2f31fa1d4;p=thirdparty%2Fzstd.git

minor variable isolation
---

diff --git a/lib/zstd_decompress.c b/lib/zstd_decompress.c
index 887348294..c90b88552 100644
--- a/lib/zstd_decompress.c
+++ b/lib/zstd_decompress.c
@@ -762,7 +762,7 @@ static size_t ZSTD_decompressSequences(
     BYTE* const ostart = (BYTE* const)dst;
     BYTE* op = ostart;
     BYTE* const oend = ostart + maxDstSize;
-    size_t errorCode, dumpsLength;
+    size_t dumpsLength;
     const BYTE* litPtr = dctx->litPtr;
     const BYTE* const litLimit_8 = litPtr + dctx->litBufSize - 8;
     const BYTE* const litEnd = litPtr + dctx->litSize;
@@ -777,11 +777,12 @@ static size_t ZSTD_decompressSequences(
     const U32 mls = dctx->fParams.mml;
 
     /* Build Decoding Tables */
-    errorCode = ZSTD_decodeSeqHeaders(&nbSeq, &dumps, &dumpsLength,
+    {   size_t const errorCode = ZSTD_decodeSeqHeaders(&nbSeq, &dumps, &dumpsLength,
                                       DTableLL, DTableML, DTableOffb,
                                       ip, seqSize);
-    if (ZSTD_isError(errorCode)) return errorCode;
-    ip += errorCode;
+        if (ZSTD_isError(errorCode)) return errorCode;
+        ip += errorCode;
+    }
 
     /* Regen sequences */
     if (nbSeq) {
@@ -793,8 +794,8 @@ static size_t ZSTD_decompressSequences(
         seqState.dumps = dumps;
         seqState.dumpsEnd = dumps + dumpsLength;
         seqState.prevOffset = REPCODE_STARTVALUE;
-        errorCode = BIT_initDStream(&(seqState.DStream), ip, iend-ip);
-        if (ERR_isError(errorCode)) return ERROR(corruption_detected);
+        { size_t const errorCode = BIT_initDStream(&(seqState.DStream), ip, iend-ip);
+          if (ERR_isError(errorCode)) return ERROR(corruption_detected); }
         FSE_initDState(&(seqState.stateLL), &(seqState.DStream), DTableLL);
         FSE_initDState(&(seqState.stateOffb), &(seqState.DStream), DTableOffb);
         FSE_initDState(&(seqState.stateML), &(seqState.DStream), DTableML);
@@ -804,8 +805,7 @@ static size_t ZSTD_decompressSequences(
             nbSeq--;
             ZSTD_decodeSequence(&sequence, &seqState, mls);
             oneSeqSize = ZSTD_execSequence(op, oend, sequence, &litPtr, litLimit_8, base, vBase, dictEnd);
-            if (ZSTD_isError(oneSeqSize))
-                return oneSeqSize;
+            if (ZSTD_isError(oneSeqSize)) return oneSeqSize;
             op += oneSeqSize;
         }