diff options
| author | Piotr Jastrzebski <haaawk@google.com> | 2014-08-18 09:12:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-18 09:12:39 +0000 |
| commit | fc1b26fc68573851029e8b988d351d081a08ed0d (patch) | |
| tree | 86edc779fb090ddc29cc3fcca778e94ee6d32ed2 /libs/androidfw | |
| parent | b47e183ca950213318f913a87af839e362c9a302 (diff) | |
| parent | 626e1c65ef408fd9eb7d3bbbbb90137e90c82a4e (diff) | |
| download | frameworks_base-fc1b26fc68573851029e8b988d351d081a08ed0d.zip frameworks_base-fc1b26fc68573851029e8b988d351d081a08ed0d.tar.gz frameworks_base-fc1b26fc68573851029e8b988d351d081a08ed0d.tar.bz2 | |
am 626e1c65: am 8a28e16c: Merge "Update ziparchive usage to the new API."
* commit '626e1c65ef408fd9eb7d3bbbbb90137e90c82a4e':
Update ziparchive usage to the new API.
Diffstat (limited to 'libs/androidfw')
| -rw-r--r-- | libs/androidfw/ZipFileRO.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/libs/androidfw/ZipFileRO.cpp b/libs/androidfw/ZipFileRO.cpp index a485d2b..5f6e831 100644 --- a/libs/androidfw/ZipFileRO.cpp +++ b/libs/androidfw/ZipFileRO.cpp @@ -50,8 +50,7 @@ public: ZipEntryName name; void *cookie; - _ZipEntryRO() : cookie(NULL) { - } + _ZipEntryRO() : cookie(NULL) {} ~_ZipEntryRO() { EndIteration(cookie); @@ -87,15 +86,15 @@ ZipFileRO::~ZipFileRO() { ZipEntryRO ZipFileRO::findEntryByName(const char* entryName) const { _ZipEntryRO* data = new _ZipEntryRO; - const int32_t error = FindEntry(mHandle, entryName, &(data->entry)); + + data->name = ZipEntryName(entryName); + + const int32_t error = FindEntry(mHandle, data->name, &(data->entry)); if (error) { delete data; return NULL; } - data->name.name = entryName; - data->name.name_length = strlen(entryName); - return (ZipEntryRO) data; } |