commit 56521f882a2c36948d2aa8bd2f6cb8f77b878b30
author Colin Cross <ccross@android.com> Fri Mar 07 02:25:20 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 07 02:25:20 2014 +0000
tree a0b8b0205d356ff4b93b16fb2c039797c7e91c33
parent 22e14c34760e8e65c5cb73804bf2c9ed4c0ca8b7
parent 13274a2661eeb9aa4b2f82db6fd11edc22af1d8a

am 13274a26: Merge "Fix logging errors inside ALOGV"

* commit '13274a2661eeb9aa4b2f82db6fd11edc22af1d8a':
  Fix logging errors inside ALOGV

libbacktrace/BacktraceMap.cpp

diff --git a/libbacktrace/BacktraceMap.cpp b/libbacktrace/BacktraceMap.cpp
index 6320800..6eb290d 100644
--- a/libbacktrace/BacktraceMap.cpp
+++ b/libbacktrace/BacktraceMap.cpp
@@ -93,7 +93,8 @@
   }
 
   ALOGV("Parsed map: start=%p, end=%p, flags=%x, name=%s",
-        map->start, map->end, map->flags, map->name.c_str());
+        reinterpret_cast<void*>(map->start), reinterpret_cast<void*>(map->end),
+        map->flags, map->name.c_str());
   return true;
 }
 

libziparchive/zip_archive.cc

diff --git a/libziparchive/zip_archive.cc b/libziparchive/zip_archive.cc
index a23d4ae..8ef0962 100644
--- a/libziparchive/zip_archive.cc
+++ b/libziparchive/zip_archive.cc
@@ -279,7 +279,7 @@
     ent = (ent + 1) & (hash_table_size - 1);
   }
 
-  ALOGV("Zip: Unable to find entry %.*s", name_length, name);
+  ALOGV("Zip: Unable to find entry %.*s", length, name);
   return kEntryNotFound;
 }