From: Bimba Shrestha <bimbashrestha@fb.com>
Date: Thu, 21 Nov 2019 21:08:27 +0000 (-0800)
Subject: Mixed declration fix
X-Git-Tag: v1.4.5^2~132^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10bce1919e2a3fb7d64b5ce7b56ecb7a98fd2655;p=thirdparty%2Fzstd.git

Mixed declration fix
---

diff --git a/lib/compress/zstd_compress.c b/lib/compress/zstd_compress.c
index f8c64994b..9211190e4 100644
--- a/lib/compress/zstd_compress.c
+++ b/lib/compress/zstd_compress.c
@@ -2457,6 +2457,7 @@ static size_t ZSTD_compressBlock_targetCBlockSize(ZSTD_CCtx* zc,
                                const void* src, size_t srcSize,
                                U32 lastBlock) {
     size_t cSize = 0;
+    int usingNoCompressSuperBlock = 0;
     DEBUGLOG(5, "ZSTD_compressBlock_targetCBlockSize (dstCapacity=%u, dictLimit=%u, nextToUpdate=%u, srcSize=%zu)",
                 (unsigned)dstCapacity, (unsigned)zc->blockState.matchState.window.dictLimit, (unsigned)zc->blockState.matchState.nextToUpdate, srcSize);
 
@@ -2470,7 +2471,6 @@ static size_t ZSTD_compressBlock_targetCBlockSize(ZSTD_CCtx* zc,
      * encode using ZSTD_noCompressSuperBlock writing sub blocks
      * in uncompressed mode.
      */
-    int usingNoCompressSuperBlock = 0;
     if (cSize == 0) {
         cSize = ZSTD_noCompressSuperBlock(dst, dstCapacity, src, srcSize, zc->appliedParams.targetCBlockSize, lastBlock);
         usingNoCompressSuperBlock = 1;