diff options
| author | Yusuke Sato <yusukes@google.com> | 2015-06-29 17:49:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-06-29 17:49:33 +0000 |
| commit | 16d520fce6a3cecdc6b50e184a00b9585b86e512 (patch) | |
| tree | dd8c0fb841448546c4565aada8c1ef2a344f68a7 /libs/androidfw/ZipFileRO.cpp | |
| parent | ffe72f70e0da02868848c7e71d8f44a5463925ea (diff) | |
| parent | f162faaa1266ad38c293e1e54911e389f39c2654 (diff) | |
Merge "Rename ZipEntryName to ZipString"
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
| -rw-r--r-- | libs/androidfw/ZipFileRO.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
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; |