From: Sen Huang <senhuang96@fb.com>
Date: Fri, 8 Nov 2019 16:20:57 +0000 (-0500)
Subject: Remove mixed declarations
X-Git-Tag: v1.4.5^2~157^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c85d10d0ea5b4aebcf5cb4f2abb253f6de860658;p=thirdparty%2Fzstd.git

Remove mixed declarations
---

diff --git a/lib/dictBuilder/zdict.c b/lib/dictBuilder/zdict.c
index 9cee71beb..344ab446b 100644
--- a/lib/dictBuilder/zdict.c
+++ b/lib/dictBuilder/zdict.c
@@ -102,25 +102,26 @@ unsigned ZDICT_getDictID(const void* dictBuffer, size_t dictSize)
 
 size_t ZDICT_getDictHeaderSize(const void* dictBuffer, size_t dictSize)
 {
+    size_t headerSize;
     if (dictSize <= 8 || MEM_readLE32(dictBuffer) != ZSTD_MAGIC_DICTIONARY) return ERROR(dictionary_corrupted);
 
-    {   size_t headerSize;
-        unsigned offcodeMaxValue = MaxOff;
+    {   unsigned offcodeMaxValue = MaxOff;
         ZSTD_compressedBlockState_t* bs = (ZSTD_compressedBlockState_t*)malloc(sizeof(ZSTD_compressedBlockState_t));
-        if (!bs) return ERROR(memory_allocation);
         U32* wksp = (U32*)malloc(HUF_WORKSPACE_SIZE);
-        if (!wksp) return ERROR(memory_allocation);
         short* offcodeNCount = (short*)malloc((MaxOff+1)*sizeof(short));
-        if (!offcodeNCount) return ERROR(memory_allocation);
+        if (!bs || !wksp || !offcodeNCount) {
+            headerSize = ERROR(memory_allocation);
+        } else {
+            ZSTD_reset_compressedBlockState(bs);
+            headerSize = ZSTD_loadCEntropy(bs, wksp, offcodeNCount, &offcodeMaxValue, dictBuffer, dictSize);
+        }
 
-        ZSTD_reset_compressedBlockState(bs);
-        headerSize = ZSTD_loadCEntropy(bs, wksp, offcodeNCount, &offcodeMaxValue, dictBuffer, dictSize);
-        
         free(bs);
         free(wksp);
         free(offcodeNCount);
-        return headerSize;
     }
+
+    return headerSize;
 }
 
 /*-********************************************************