Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af1d7411 authored by Aurimas Liutikas's avatar Aurimas Liutikas
Browse files

Fix 2 unused parameter warnings in zipalign. 

ZipFile parameter was not used and therefore can be removed.

Bug: 26936282
Change-Id: Id2b6e693b40571b7e7486304a6effaedc1b3c940
parent 0c5c5099

tools/zipalign/ZipEntry.cpp

+1 −2
Original line number Diff line number Diff line
@@ -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.

tools/zipalign/ZipEntry.h

+1 −1
Original line number Diff line number Diff line
@@ -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

tools/zipalign/ZipFile.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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;