diff options
| author | Yusuke Sato <yusukes@google.com> | 2015-06-29 18:01:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-29 18:01:14 +0000 |
| commit | d3d6e9a37e86e386988b84120d53cf52192dbc21 (patch) | |
| tree | 2e50c1806bc54b364d8c7df0f11b304251e46540 /libs/androidfw/ZipFileRO.cpp | |
| parent | d490a1a37516287f8b6287dd16f51b1dfa924d6b (diff) | |
| parent | 16d520fce6a3cecdc6b50e184a00b9585b86e512 (diff) | |
am 16d520fc: Merge "Rename ZipEntryName to ZipString"
* commit '16d520fce6a3cecdc6b50e184a00b9585b86e512':
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; |