From: Paul Cruz <paulcruz74@fb.com>
Date: Tue, 20 Jun 2017 00:18:43 +0000 (-0700)
Subject: fixed for loop declaration, fixed test case
X-Git-Tag: v1.3.0~1^2~15^2~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bdec7b8ce7b131779d768f60776f6eb0dee8f54d;p=thirdparty%2Fzstd.git

fixed for loop declaration, fixed test case
---

diff --git a/tests/decodecorpus.c b/tests/decodecorpus.c
index d2bf565c9..14d3f2358 100644
--- a/tests/decodecorpus.c
+++ b/tests/decodecorpus.c
@@ -1194,8 +1194,11 @@ static int genRandomDict(U32 dictID, U32 seed, size_t dictSize, BYTE* fullDict){
             BYTE* curr = samples;
             while (i <= 4) {
                 *(sampleSizes + i - 1) = currSize;
-                for (size_t j = 0; j < currSize; j++) {
-                    *(curr++) = (BYTE)i;
+                {
+                    size_t j;
+                    for (j = 0; j < currSize; j++) {
+                        *(curr++) = (BYTE)i;
+                    }
                 }
                 i++;
                 currSize *= 16;
@@ -1300,7 +1303,7 @@ cleanup:
 static size_t testDecodeWithDict(U32 seed, size_t dictSize)
 {
     U32 const dictID = RAND(&seed);
-    int errorDetected = 0;
+    size_t errorDetected = 0;
     BYTE* const fullDict = malloc(dictSize);
     if (fullDict == NULL) {
         return ERROR(GENERIC);
@@ -1314,7 +1317,7 @@ static size_t testDecodeWithDict(U32 seed, size_t dictSize)
         }
     }
 
-    frame_t* fr;
+    frame_t fr;
     {
         size_t dictContentSize = dictSize-dictSize/4;
         BYTE* const dictContent = fullDict+dictSize/4;
@@ -1329,12 +1332,12 @@ static size_t testDecodeWithDict(U32 seed, size_t dictSize)
                                                    fr.dataStart, (BYTE*)fr.data - (BYTE*)fr.dataStart,
                                                    fullDict, dictSize);
             if (ZSTD_isError(returnValue)) {
-               errorDetected = ZSTD_getErrorName(returnValue);
-               goto dictTestCleanup
+               errorDetected = returnValue;
+               goto dictTestCleanup;
             }
         }
 
-        if (memcmp(DECOMPRESSED_BUFFER, fr->srcStart, (BYTE*)fr->src - (BYTE*)fr->srcStart) != 0) {
+        if (memcmp(DECOMPRESSED_BUFFER, fr.srcStart, (BYTE*)fr.src - (BYTE*)fr.srcStart) != 0) {
             errorDetected = ERROR(corruption_detected);
             goto dictTestCleanup;
         }