Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 16d520fc: Merge "Rename ZipEntryName to ZipString"

Browse Source 
* commit '16d520fce6a3cecdc6b50e184a00b9585b86e512':
  Rename ZipEntryName to ZipString
This commit is contained in:
Yusuke Sato
2015-06-29 18:01:14 +00:00
committed by Android Git Automerger
parent d490a1a375 16d520fce6
commit d3d6e9a37e
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libs/androidfw/ZipFileRO.cpp
View File

@@ -39,7 +39,7 @@ using namespace android;
class _ZipEntryRO { class _ZipEntryRO {
public: public:
ZipEntry entry; ZipEntry entry;
ZipEntryName name; ZipString name;
void *cookie; void *cookie;
_ZipEntryRO() : cookie(NULL) {} _ZipEntryRO() : cookie(NULL) {}
@@ -79,7 +79,7 @@ ZipEntryRO ZipFileRO::findEntryByName(const char* entryName) const
{ {
_ZipEntryRO* data = new _ZipEntryRO; _ZipEntryRO* data = new _ZipEntryRO;
data->name = ZipEntryName(entryName); data->name = ZipString(entryName);
const int32_t error = FindEntry(mHandle, data->name, &(data->entry)); const int32_t error = FindEntry(mHandle, data->name, &(data->entry));
if (error) { if (error) {
@@ -128,7 +128,8 @@ bool ZipFileRO::getEntryInfo(ZipEntryRO entry, uint16_t* pMethod,
bool ZipFileRO::startIteration(void** cookie) bool ZipFileRO::startIteration(void** cookie)
{ {
_ZipEntryRO* ze = new _ZipEntryRO; _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) { if (error) {
ALOGW("Could not start iteration over %s: %s", mFileName, ErrorCodeString(error)); ALOGW("Could not start iteration over %s: %s", mFileName, ErrorCodeString(error));
delete ze; delete ze;