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

* commit 'd90b11b6c1905eb7c86dc2cf17314edb37ba4592':
  Fix logging errors inside ALOGV
This commit is contained in:
Colin Cross 2014-02-08 05:37:30 +00:00 committed by Android Git Automerger
commit ec04a8d45b
2 changed files with 3 additions and 2 deletions

View File

@ -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;
}

View File

@ -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;
}