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

Commit d3d6e9a3 authored by Yusuke Sato's avatar Yusuke Sato Committed by Android Git Automerger
Browse files

am 16d520fc: Merge "Rename ZipEntryName to ZipString" 

* commit '16d520fc':
  Rename ZipEntryName to ZipString
parents d490a1a3 16d520fc

libs/androidfw/ZipFileRO.cpp

+4 −3
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ using namespace android; 
class _ZipEntryRO {

public:

    ZipEntry entry;

    ZipEntryName name;

    ZipString name;

    void *cookie;



    _ZipEntryRO() : cookie(NULL) {}
@@ -79,7 +79,7 @@ ZipEntryRO ZipFileRO::findEntryByName(const char* entryName) const 
{

    _ZipEntryRO* data = new _ZipEntryRO;



    data->name = ZipEntryName(entryName);

    data->name = ZipString(entryName);



    const int32_t error = FindEntry(mHandle, data->name, &(data->entry));

    if (error) {
@@ -128,7 +128,8 @@ bool ZipFileRO::getEntryInfo(ZipEntryRO entry, uint16_t* pMethod, 
bool ZipFileRO::startIteration(void** cookie)

{

    _ZipEntryRO* ze = new _ZipEntryRO;

    int32_t error = StartIteration(mHandle, &(ze->cookie), NULL /* prefix */);

    int32_t error = StartIteration(mHandle, &(ze->cookie),

                                   NULL /* prefix */, NULL /* suffix */);

    if (error) {

        ALOGW("Could not start iteration over %s: %s", mFileName, ErrorCodeString(error));

        delete ze;