diff options
| author | Piotr Jastrzebski <haaawk@google.com> | 2014-08-13 07:50:20 +0100 |
|---|---|---|
| committer | Piotr Jastrzebski <haaawk@google.com> | 2014-08-15 14:41:08 +0100 |
| commit | e2134a4b5dafc37f2de7e9b4190819f24aac207c (patch) | |
| tree | c549a9bc3e49676b74a449d3081cdaec1ff36a5f /libs/androidfw/ZipFileRO.cpp | |
| parent | 4179e88963456946fe6e580f2211341cc8ccba5c (diff) | |
| download | frameworks_base-e2134a4b5dafc37f2de7e9b4190819f24aac207c.zip frameworks_base-e2134a4b5dafc37f2de7e9b4190819f24aac207c.tar.gz frameworks_base-e2134a4b5dafc37f2de7e9b4190819f24aac207c.tar.bz2 | |
Update ziparchive usage to the new API.
Bug: 16162465
Change-Id: If3064e2be3e7e85366b07434294a7879b0e5f9bc
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
| -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; } |