Merge "Surpress warnings in minzip/Zip.c" am: 4b3cdce702

am: 0d63468171

* commit '0d63468171a80bd84a859fbd36b8d874f030c764':
  Surpress warnings in minzip/Zip.c
This commit is contained in:
Tianjie Xu
2016-02-23 19:30:13 +00:00
committed by android-build-merger
+1 -4
View File
@@ -509,9 +509,6 @@ static bool processDeflatedEntry(const ZipArchive *pArchive,
unsigned char procBuf[32 * 1024];
z_stream zstream;
int zerr;
long compRemaining;
compRemaining = pEntry->compLen;
/*
* Initialize the zlib stream.
@@ -759,7 +756,7 @@ static const char *targetEntryPath(MzPathHelper *helper, ZipEntry *pEntry)
*/
needLen = helper->targetDirLen + 1 +
pEntry->fileNameLen - helper->zipDirLen + 1;
if (needLen > helper->bufLen) {
if (firstTime || needLen > helper->bufLen) {
char *newBuf;
needLen *= 2;