]> git.saurik.com Git - android/aapt.git/commitdiff
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE
authorSteve Block <steveblock@google.com>
Thu, 5 Jan 2012 23:22:43 +0000 (23:22 +0000)
committerSteve Block <steveblock@google.com>
Fri, 6 Jan 2012 10:07:54 +0000 (10:07 +0000)
See https://android-git.corp.google.com/g/157065

Bug: 5449033
Change-Id: I00a4b904f9449e6f93b7fd35eac28640d7929e69

ZipEntry.cpp
ZipFile.cpp

index 1f3c93c3be3e6874ee56e90eaf998ea670a81d41..b575988f027734d97a4824bd1e1448ade612857d 100644 (file)
@@ -90,7 +90,7 @@ status_t ZipEntry::initFromCDE(FILE* fp)
      * prefer the CDE values.)
      */
     if (!hasDD && !compareHeaders()) {
-        LOGW("warning: header mismatch\n");
+        ALOGW("warning: header mismatch\n");
         // keep going?
     }
 
index a2d5b80063a18a6b509cadf9a1f03c7f1c598a65..6428e9d4d421c5be4deef1f0b7a44a7531d55c19 100644 (file)
@@ -603,7 +603,7 @@ status_t ZipFile::add(const ZipFile* pSourceZip, const ZipEntry* pSourceEntry,
     if (copyPartialFpToFp(mZipFp, pSourceZip->mZipFp, copyLen, NULL)
         != NO_ERROR)
     {
-        LOGW("copy of '%s' failed\n", pEntry->mCDE.mFileName);
+        ALOGW("copy of '%s' failed\n", pEntry->mCDE.mFileName);
         result = UNKNOWN_ERROR;
         goto bail;
     }
@@ -931,7 +931,7 @@ status_t ZipFile::flush(void)
      * of wasted space at the end of the file.  Remove it now.
      */
     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
     }