Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/157065 Bug: 5449033 Change-Id: I817c12b1e97bee598097d02c70d509f7ab70576a
This commit is contained in:
@@ -90,7 +90,7 @@ status_t ZipEntry::initFromCDE(FILE* fp)
|
|||||||
* prefer the CDE values.)
|
* prefer the CDE values.)
|
||||||
*/
|
*/
|
||||||
if (!hasDD && !compareHeaders()) {
|
if (!hasDD && !compareHeaders()) {
|
||||||
LOGW("WARNING: header mismatch\n");
|
ALOGW("WARNING: header mismatch\n");
|
||||||
// keep going?
|
// keep going?
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -603,7 +603,7 @@ status_t ZipFile::add(const ZipFile* pSourceZip, const ZipEntry* pSourceEntry,
|
|||||||
if (copyPartialFpToFp(mZipFp, pSourceZip->mZipFp, copyLen, NULL)
|
if (copyPartialFpToFp(mZipFp, pSourceZip->mZipFp, copyLen, NULL)
|
||||||
!= NO_ERROR)
|
!= NO_ERROR)
|
||||||
{
|
{
|
||||||
LOGW("copy of '%s' failed\n", pEntry->mCDE.mFileName);
|
ALOGW("copy of '%s' failed\n", pEntry->mCDE.mFileName);
|
||||||
result = UNKNOWN_ERROR;
|
result = UNKNOWN_ERROR;
|
||||||
goto bail;
|
goto bail;
|
||||||
}
|
}
|
||||||
@@ -931,7 +931,7 @@ status_t ZipFile::flush(void)
|
|||||||
* of wasted space at the end of the file. Remove it now.
|
* of wasted space at the end of the file. Remove it now.
|
||||||
*/
|
*/
|
||||||
if (ftruncate(fileno(mZipFp), ftell(mZipFp)) != 0) {
|
if (ftruncate(fileno(mZipFp), ftell(mZipFp)) != 0) {
|
||||||
LOGW("ftruncate failed %ld: %s\n", ftell(mZipFp), strerror(errno));
|
ALOGW("ftruncate failed %ld: %s\n", ftell(mZipFp), strerror(errno));
|
||||||
// not fatal
|
// not fatal
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user