diff options
| author | Colin Cross <ccross@android.com> | 2014-02-07 22:38:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-07 22:38:37 +0000 |
| commit | d90b11b6c1905eb7c86dc2cf17314edb37ba4592 (patch) | |
| tree | 1ae217ed19f8c739ce950ed9631e39c536eace8d | |
| parent | 3bff7e3e65d382a8474e0b20dbcf616cfdd82a2d (diff) | |
| parent | 13274a2661eeb9aa4b2f82db6fd11edc22af1d8a (diff) | |
| download | system_core-d90b11b6c1905eb7c86dc2cf17314edb37ba4592.zip system_core-d90b11b6c1905eb7c86dc2cf17314edb37ba4592.tar.gz system_core-d90b11b6c1905eb7c86dc2cf17314edb37ba4592.tar.bz2 | |
am 13274a26: Merge "Fix logging errors inside ALOGV"
* commit '13274a2661eeb9aa4b2f82db6fd11edc22af1d8a':
Fix logging errors inside ALOGV
| -rw-r--r-- | libbacktrace/BacktraceMap.cpp | 3 | ||||
| -rw-r--r-- | libziparchive/zip_archive.cc | 2 |
2 files changed, 3 insertions, 2 deletions
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 @@ bool BacktraceMap::ParseLine(const char* line, backtrace_map_t* map) { } 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; } 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 @@ static int64_t EntryToIndex(const ZipEntryName* hash_table, 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; } |