From f162faaa1266ad38c293e1e54911e389f39c2654 Mon Sep 17 00:00:00 2001 From: Yusuke Sato Date: Thu, 25 Jun 2015 14:58:16 -0700 Subject: Rename ZipEntryName to ZipString Also add a 4th parameter to StartIteration(). This is for https://android-review.googlesource.com/#/c/156771/. Bug: 21957428 Change-Id: Ifbf9aec2f04b214b57e99c306282d7c0d39675a9 --- libs/androidfw/ZipFileRO.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'libs/androidfw/ZipFileRO.cpp') diff --git a/libs/androidfw/ZipFileRO.cpp b/libs/androidfw/ZipFileRO.cpp index b61d17926dc3..bdb659c38b42 100644 --- a/libs/androidfw/ZipFileRO.cpp +++ b/libs/androidfw/ZipFileRO.cpp @@ -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; -- cgit v1.2.3-59-g8ed1b