From: Dan Morrill <morrildl@google.com>
Date: Fri, 6 Jan 2012 22:39:11 +0000 (-0800)
Subject: Merge "Minor tweak to console output."
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/16d112f31d06da027b99b18400a47454b5e9bc0e?hp=4a8f58fa353a64ba332abb12e02bb04b5a5e1091

Merge "Minor tweak to console output."
---

diff --git a/ZipEntry.cpp b/ZipEntry.cpp
index 1f3c93c..b575988 100644
--- a/ZipEntry.cpp
+++ b/ZipEntry.cpp
@@ -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?
     }
 
diff --git a/ZipFile.cpp b/ZipFile.cpp
index a2d5b80..6428e9d 100644
--- a/ZipFile.cpp
+++ b/ZipFile.cpp
@@ -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
     }