From: Yann Collet <yann.collet.73@gmail.com>
Date: Sun, 13 Dec 2015 12:58:51 +0000 (+0100)
Subject: fixed arm-specific shadow warning
X-Git-Tag: v0.4.4^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d4fa0ed9b8a3aebcb4420b910446799dea2f5a8;p=thirdparty%2Fzstd.git

fixed arm-specific shadow warning
---

diff --git a/programs/fileio.c b/programs/fileio.c
index 38b204bca..81635b934 100644
--- a/programs/fileio.c
+++ b/programs/fileio.c
@@ -260,7 +260,7 @@ unsigned long long FIO_compressFilename(const char* output_filename, const char*
     if (dictFileName)
     {
         FILE* dictHandle;
-        size_t read;
+        size_t readSize;
         DISPLAYLEVEL(4,"Using %s as dictionary \n", dictFileName);
         dictHandle = fopen(dictFileName, "rb");
         if (dictHandle==0) EXM_THROW(21, "Error opening dictionary file %s", dictFileName);
@@ -276,8 +276,8 @@ unsigned long long FIO_compressFilename(const char* output_filename, const char*
         }
         dictBuff = (BYTE*)malloc((size_t)dictSize);
         if (dictBuff==NULL) EXM_THROW(20, "Allocation error : not enough memory for dictBuff");
-        read = fread(dictBuff, 1, (size_t)dictSize, dictHandle);
-        if (read!=dictSize) EXM_THROW(21, "Error reading dictionary file %s", dictFileName);
+        readSize = fread(dictBuff, 1, (size_t)dictSize, dictHandle);
+        if (readSize!=dictSize) EXM_THROW(21, "Error reading dictionary file %s", dictFileName);
         fclose(dictHandle);
     }
 
@@ -407,7 +407,7 @@ unsigned long long FIO_decompressFilename(const char* output_filename, const cha
     if (dictFileName)
     {
         FILE* dictHandle;
-        size_t read;
+        size_t readSize;
         DISPLAYLEVEL(4,"Using %s as dictionary \n", dictFileName);
         dictHandle = fopen(dictFileName, "rb");
         if (dictHandle==0) EXM_THROW(21, "Error opening dictionary file %s", dictFileName);
@@ -423,8 +423,8 @@ unsigned long long FIO_decompressFilename(const char* output_filename, const cha
         }
         dictBuff = (BYTE*)malloc(dictSize);
         if (dictBuff==NULL) EXM_THROW(20, "Allocation error : not enough memory for dictBuff");
-        read = fread(dictBuff, 1, (size_t)dictSize, dictHandle);
-        if (read!=dictSize) EXM_THROW(21, "Error reading dictionary file %s", dictFileName);
+        readSize = fread(dictBuff, 1, (size_t)dictSize, dictHandle);
+        if (readSize!=dictSize) EXM_THROW(21, "Error reading dictionary file %s", dictFileName);
         fclose(dictHandle);
     }