diff options
| author | Christopher Ferris <cferris@google.com> | 2014-01-14 01:18:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-01-14 01:18:20 +0000 |
| commit | 688701990db1aef2d7dbe0ccdc4f12c2dd5f51a8 (patch) | |
| tree | 1d54b47650638f38f37a914abb50ab52a6852b69 /libbacktrace/Backtrace.cpp | |
| parent | 105f6b6686ae1b2f6ae8ae81548cceb313fb2cee (diff) | |
| parent | 20303f856f1f1cdb5af58af0b116b8c598f0ea5c (diff) | |
| download | system_core-688701990db1aef2d7dbe0ccdc4f12c2dd5f51a8.zip system_core-688701990db1aef2d7dbe0ccdc4f12c2dd5f51a8.tar.gz system_core-688701990db1aef2d7dbe0ccdc4f12c2dd5f51a8.tar.bz2 | |
Merge "Next phase of the move, reformat use C++ features."
Diffstat (limited to 'libbacktrace/Backtrace.cpp')
| -rw-r--r-- | libbacktrace/Backtrace.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libbacktrace/Backtrace.cpp b/libbacktrace/Backtrace.cpp index a7568e0..fa85872 100644 --- a/libbacktrace/Backtrace.cpp +++ b/libbacktrace/Backtrace.cpp @@ -125,7 +125,10 @@ const backtrace_map_info_t* Backtrace::FindMapInfo(uintptr_t ptr) { } std::string Backtrace::FormatFrameData(size_t frame_num) { - backtrace_frame_data_t* frame = &backtrace_.frames[frame_num]; + return FormatFrameData(&backtrace_.frames[frame_num]); +} + +std::string Backtrace::FormatFrameData(const backtrace_frame_data_t* frame) { const char* map_name; if (frame->map_name) { map_name = frame->map_name; @@ -142,13 +145,13 @@ std::string Backtrace::FormatFrameData(size_t frame_num) { char buf[512]; if (frame->func_name && frame->func_offset) { snprintf(buf, sizeof(buf), "#%02zu pc %0*" PRIxPTR " %s (%s+%" PRIuPTR ")", - frame_num, (int)sizeof(uintptr_t)*2, relative_pc, map_name, + frame->num, (int)sizeof(uintptr_t)*2, relative_pc, map_name, frame->func_name, frame->func_offset); } else if (frame->func_name) { - snprintf(buf, sizeof(buf), "#%02zu pc %0*" PRIxPTR " %s (%s)", frame_num, + snprintf(buf, sizeof(buf), "#%02zu pc %0*" PRIxPTR " %s (%s)", frame->num, (int)sizeof(uintptr_t)*2, relative_pc, map_name, frame->func_name); } else { - snprintf(buf, sizeof(buf), "#%02zu pc %0*" PRIxPTR " %s", frame_num, + snprintf(buf, sizeof(buf), "#%02zu pc %0*" PRIxPTR " %s", frame->num, (int)sizeof(uintptr_t)*2, relative_pc, map_name); } |