From 323e3963da9125bfbc13f18cf2c80a58616c3d5d Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 21 Oct 2014 18:11:44 +0200 Subject: [PATCH] (7zIn.c) Get rid of one pedantic warning - declaration shadows a local variable --- deps/7zip/7zIn.c | 35 ----------------------------------- 1 file changed, 35 deletions(-) diff --git a/deps/7zip/7zIn.c b/deps/7zip/7zIn.c index 828b0ae342..b2b67b063b 100755 --- a/deps/7zip/7zIn.c +++ b/deps/7zip/7zIn.c @@ -268,40 +268,6 @@ int SzArEx_GetFolderFullPackSize(const CSzArEx *p, uint32_t folderIndex, uint64_ } -/* - SRes SzReadTime(const CObjectVector &dataVector, - CObjectVector &files, uint64_t type) - { - CBoolVector boolVector; - RINOK(ReadBoolVector2(files.Size(), boolVector)) - - CStreamSwitch streamSwitch; - RINOK(streamSwitch.Set(this, &dataVector)); - - for (int i = 0; i < files.Size(); i++) - { - CSzFileItem &file = files[i]; - CArchiveFileTime fileTime; - bool defined = boolVector[i]; - if (defined) - { - uint32_t low, high; - RINOK(SzReaduint32_t(low)); - RINOK(SzReaduint32_t(high)); - fileTime.dwLowDateTime = low; - fileTime.dwHighDateTime = high; - } - switch(type) - { - case k7zIdCTime: file.IsCTimeDefined = defined; if (defined) file.CTime = fileTime; break; - case k7zIdATime: file.IsATimeDefined = defined; if (defined) file.ATime = fileTime; break; - case k7zIdMTime: file.IsMTimeDefined = defined; if (defined) file.MTime = fileTime; break; - } - } - return SZ_OK; - } - */ - static int TestSignatureCandidate(uint8_t *testuint8_ts) { size_t i; @@ -998,7 +964,6 @@ static SRes SzReadHeader2( for (;;) { - uint64_t type; uint64_t size; RINOK(SzReadID(sd, &type)); if (type == k7zIdEnd)