commit f162faaa1266ad38c293e1e54911e389f39c2654
author Yusuke Sato <yusukes@google.com> Thu Jun 25 14:58:16 2015 -0700
committer Yusuke Sato <yusukes@google.com> Thu Jun 25 14:58:16 2015 -0700
tree c09a8bf5b8fe2165eec4c5df87da1582289cb6b1
parent fdb70dc4346f801673aa700f3fca2b8cc77b809c

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

diff --git a/libs/androidfw/ZipFileRO.cpp b/libs/androidfw/ZipFileRO.cpp
index b61d179..bdb659c 100644
--- a/libs/androidfw/ZipFileRO.cpp
+++ b/libs/androidfw/ZipFileRO.cpp
@@ -39,7 +39,7 @@
 class _ZipEntryRO {
 public:
     ZipEntry entry;
-    ZipEntryName name;
+    ZipString name;
     void *cookie;
 
     _ZipEntryRO() : cookie(NULL) {}
@@ -79,7 +79,7 @@
 {
     _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::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;