diff options
| author | 2016-02-11 18:11:21 -0800 | |
|---|---|---|
| committer | 2016-02-12 02:13:30 +0000 | |
| commit | af1d7411825e589f09074c04bbbd80497b60e9e9 (patch) | |
| tree | 8811d841c6dcf63a919b8994ce8fdec2074f7f4b | |
| parent | 0c5c50997b5a414774144a2d2f75055fcb055cdd (diff) | |
Fix 2 unused parameter warnings in zipalign.
ZipFile parameter was not used and therefore can be removed.
Bug: 26936282
Change-Id: Id2b6e693b40571b7e7486304a6effaedc1b3c940
| -rw-r--r-- | tools/zipalign/ZipEntry.cpp | 3 | ||||
| -rw-r--r-- | tools/zipalign/ZipEntry.h | 2 | ||||
| -rw-r--r-- | tools/zipalign/ZipFile.cpp | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/tools/zipalign/ZipEntry.cpp b/tools/zipalign/ZipEntry.cpp index a13b8d102d..2f33e23054 100644 --- a/tools/zipalign/ZipEntry.cpp +++ b/tools/zipalign/ZipEntry.cpp @@ -142,8 +142,7 @@ void ZipEntry::initNew(const char* fileName, const char* comment) * * Initializes the CDE and the LFH. */ -status_t ZipEntry::initFromExternal(const ZipFile* pZipFile, - const ZipEntry* pEntry) +status_t ZipEntry::initFromExternal(const ZipEntry* pEntry) { /* * Copy everything in the CDE over, then fix up the hairy bits. diff --git a/tools/zipalign/ZipEntry.h b/tools/zipalign/ZipEntry.h index 129a7591a0..e06567d135 100644 --- a/tools/zipalign/ZipEntry.h +++ b/tools/zipalign/ZipEntry.h @@ -167,7 +167,7 @@ protected: * Initialize the structure with the contents of a ZipEntry from * 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 diff --git a/tools/zipalign/ZipFile.cpp b/tools/zipalign/ZipFile.cpp index 7c3ff3746c..4edf0aa394 100644 --- a/tools/zipalign/ZipFile.cpp +++ b/tools/zipalign/ZipFile.cpp @@ -566,7 +566,7 @@ status_t ZipFile::add(const ZipFile* pSourceZip, const ZipEntry* pSourceEntry, goto bail; } - result = pEntry->initFromExternal(pSourceZip, pSourceEntry); + result = pEntry->initFromExternal(pSourceEntry); if (result != NO_ERROR) goto bail; if (padding != 0) { @@ -673,7 +673,7 @@ status_t ZipFile::addRecompress(const ZipFile* pSourceZip, const ZipEntry* pSour goto bail; } - result = pEntry->initFromExternal(pSourceZip, pSourceEntry); + result = pEntry->initFromExternal(pSourceEntry); if (result != NO_ERROR) goto bail; |