StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move zipalign off NO_ERROR.

Browse Source 
I really only care about code that's built for Windows, but I may as
well clean up anywhere that's easy to clean up too...

Bug: N/A
Test: builds
Change-Id: I3ef34fb12ac90e9411b6421e9c23dd8524f056ae
This commit is contained in:
Elliott Hughes
2018-10-08 11:19:28 -07:00
parent c18b2b28c2
commit ad7d562d27
3 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tools/zipalign/ZipEntry.cpp
View File

@@ -48,7 +48,7 @@ status_t ZipEntry::initFromCDE(FILE* fp)
/* read the CDE */
result = mCDE.read(fp);
if (result != NO_ERROR) {
if (result != OK) {
ALOGD("mCDE.read failed\n");
return result;
}
@@ -64,7 +64,7 @@ status_t ZipEntry::initFromCDE(FILE* fp)
}
result = mLFH.read(fp);
if (result != NO_ERROR) {
if (result != OK) {
ALOGD("mLFH.read failed\n");
return result;
}
@@ -103,7 +103,7 @@ status_t ZipEntry::initFromCDE(FILE* fp)
* can defer worrying about that to when we're extracting data.
*/
return NO_ERROR;
return OK;
}
/*
@@ -189,7 +189,7 @@ status_t ZipEntry::initFromExternal(const ZipEntry* pEntry)
mLFH.mExtraFieldLength+1);
}
return NO_ERROR;
return OK;
}
/*
@@ -225,7 +225,7 @@ status_t ZipEntry::addPadding(int padding)
mLFH.mExtraFieldLength = padding;
}
return NO_ERROR;
return OK;
}
/*
@@ -403,7 +403,7 @@ void ZipEntry::setModWhen(time_t when)
*/
status_t ZipEntry::LocalFileHeader::read(FILE* fp)
{
status_t result = NO_ERROR;
status_t result = OK;
uint8_t buf[kLFHLen];
assert(mFileName == NULL);
@@ -499,7 +499,7 @@ status_t ZipEntry::LocalFileHeader::write(FILE* fp)
return UNKNOWN_ERROR;
}
return NO_ERROR;
return OK;
}
@@ -537,7 +537,7 @@ void ZipEntry::LocalFileHeader::dump(void) const
*/
status_t ZipEntry::CentralDirEntry::read(FILE* fp)
{
status_t result = NO_ERROR;
status_t result = OK;
uint8_t buf[kCDELen];
/* no re-use */
@@ -669,7 +669,7 @@ status_t ZipEntry::CentralDirEntry::write(FILE* fp)
return UNKNOWN_ERROR;
}
return NO_ERROR;
return OK;
}
/*