diff options
| author | Elliott Hughes <enh@google.com> | 2014-02-03 00:45:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-03 00:45:01 +0000 |
| commit | 784b6181cfd2a0362f35d32ee62a98ab60437397 (patch) | |
| tree | a0796ca36929716800f0c513046fecd9ee59708c | |
| parent | da9b5dab2d565f9682fe1fb3555702bf82334ab4 (diff) | |
| parent | cf53e5dbdfa06a16104f4ffa03aeeb538fbd1509 (diff) | |
| download | system_core-784b6181cfd2a0362f35d32ee62a98ab60437397.zip system_core-784b6181cfd2a0362f35d32ee62a98ab60437397.tar.gz system_core-784b6181cfd2a0362f35d32ee62a98ab60437397.tar.bz2 | |
am cf53e5db: Merge "Fix debuggerd\'s symbol offset output."
* commit 'cf53e5dbdfa06a16104f4ffa03aeeb538fbd1509':
Fix debuggerd's symbol offset output.
| -rwxr-xr-x | debuggerd/tombstone.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/debuggerd/tombstone.cpp b/debuggerd/tombstone.cpp index 5acf16d..c630020 100755 --- a/debuggerd/tombstone.cpp +++ b/debuggerd/tombstone.cpp @@ -243,7 +243,7 @@ static void dump_stack_segment( if (!func_name.empty()) { if (!i && label >= 0) { if (offset) { - _LOG(log, scope_flags, " #%02d %" PRIPTR " %" PRIPTR " %s (%s+%" PRIxPTR "u)\n", + _LOG(log, scope_flags, " #%02d %" PRIPTR " %" PRIPTR " %s (%s+%" PRIuPTR ")\n", label, *sp, stack_content, map_name, func_name.c_str(), offset); } else { _LOG(log, scope_flags, " #%02d %" PRIPTR " %" PRIPTR " %s (%s)\n", @@ -251,7 +251,7 @@ static void dump_stack_segment( } } else { if (offset) { - _LOG(log, scope_flags, " %" PRIPTR " %" PRIPTR " %s (%s+%" PRIxPTR "u)\n", + _LOG(log, scope_flags, " %" PRIPTR " %" PRIPTR " %s (%s+%" PRIuPTR ")\n", *sp, stack_content, map_name, func_name.c_str(), offset); } else { _LOG(log, scope_flags, " %" PRIPTR " %" PRIPTR " %s (%s)\n", |