openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Fix 2 unused parameter warnings in zipalign. 

ZipFile parameter was not used and therefore can be removed.

Bug: 26936282
Change-Id: Id2b6e693b40571b7e7486304a6effaedc1b3c940
This commit is contained in:
Aurimas Liutikas 2016-02-11 18:11:21 -08:00
parent 0c5c50997b
commit af1d741182
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/zipalign/ZipEntry.cpp
View File

@ -142,8 +142,7 @@ void ZipEntry::initNew(const char* fileName, const char* comment)
* *
* Initializes the CDE and the LFH. * Initializes the CDE and the LFH.
*/ */
status_t ZipEntry::initFromExternal(const ZipFile* pZipFile, status_t ZipEntry::initFromExternal(const ZipEntry* pEntry)
const ZipEntry* pEntry)
{ {
/* /*
* Copy everything in the CDE over, then fix up the hairy bits. * Copy everything in the CDE over, then fix up the hairy bits.

2
tools/zipalign/ZipEntry.h
View File

@ -167,7 +167,7 @@ protected:
* Initialize the structure with the contents of a ZipEntry from * Initialize the structure with the contents of a ZipEntry from
* another file. * another file.
*/ */
status_t initFromExternal(const ZipFile* pZipFile, const ZipEntry* pEntry); status_t initFromExternal(const ZipEntry* pEntry);
/* /*
* Add some pad bytes to the LFH. We do this by adding or resizing * Add some pad bytes to the LFH. We do this by adding or resizing

4
tools/zipalign/ZipFile.cpp
View File

@ -566,7 +566,7 @@ status_t ZipFile::add(const ZipFile* pSourceZip, const ZipEntry* pSourceEntry,
goto bail; goto bail;
} }
result = pEntry->initFromExternal(pSourceZip, pSourceEntry); result = pEntry->initFromExternal(pSourceEntry);
if (result != NO_ERROR) if (result != NO_ERROR)
goto bail; goto bail;
if (padding != 0) { if (padding != 0) {
@ -673,7 +673,7 @@ status_t ZipFile::addRecompress(const ZipFile* pSourceZip, const ZipEntry* pSour
goto bail; goto bail;
} }
result = pEntry->initFromExternal(pSourceZip, pSourceEntry); result = pEntry->initFromExternal(pSourceEntry);
if (result != NO_ERROR) if (result != NO_ERROR)
goto bail; goto bail;