diff options
| author | Colin Cross <ccross@android.com> | 2014-02-08 05:37:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-08 05:37:30 +0000 |
| commit | ec04a8d45bc6b01c3c2cd4a3064d194f7beeb386 (patch) | |
| tree | 1b105d0f8db3641faef8b057773348e767cc61e1 | |
| parent | 00010369a6a4d9b3db58a22dfeca258f328147da (diff) | |
| parent | d90b11b6c1905eb7c86dc2cf17314edb37ba4592 (diff) | |
| download | system_core-ec04a8d45bc6b01c3c2cd4a3064d194f7beeb386.zip system_core-ec04a8d45bc6b01c3c2cd4a3064d194f7beeb386.tar.gz system_core-ec04a8d45bc6b01c3c2cd4a3064d194f7beeb386.tar.bz2 | |
am d90b11b6: am 13274a26: Merge "Fix logging errors inside ALOGV"
* commit 'd90b11b6c1905eb7c86dc2cf17314edb37ba4592':
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; } |