strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

better use a backward compatible way to change the output

Browse source 
Change-Id: If5829e321db8af1f09cccafaf34a18343492f514
This commit is contained in:
Markus Mohrhard 2016-06-27 02:14:58 +02:00
parent 3464bb16e6
commit 74c01bb89f
1 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
external/breakpad/breakpad-stackwalk.patch.1 vendored
View file

@ -1,16 +1,32 @@
diff -ur breakpad.org/src/processor/stackwalk_common.cc breakpad/src/processor/stackwalk_common.cc diff -ur breakpad.org/src/processor/stackwalk_common.cc breakpad/src/processor/stackwalk_common.cc
--- breakpad.org/src/processor/stackwalk_common.cc 2016-06-25 01:38:53.282302964 +0200 --- breakpad.org/src/processor/stackwalk_common.cc 2016-06-27 02:06:43.304932691 +0200
+++ breakpad/src/processor/stackwalk_common.cc 2016-06-25 01:42:58.463821357 +0200 +++ breakpad/src/processor/stackwalk_common.cc 2016-06-27 02:10:22.815642476 +0200
@@ -767,9 +767,11 @@ @@ -750,7 +750,7 @@
// one per line, in the following machine-readable pipe-delimited
// text format:
// Module|{Module Filename}|{Version}|{Debug Filename}|{Debug Identifier}|
-// {Base Address}|{Max Address}|{Main}
+// {Base Address}|{Max Address}|{Main}|{Code Identifier}
static void PrintModulesMachineReadable(const CodeModules *modules) {
if (!modules)
return;
@@ -767,7 +767,7 @@
++module_sequence) { ++module_sequence) {
const CodeModule *module = modules->GetModuleAtSequence(module_sequence); const CodeModule *module = modules->GetModuleAtSequence(module_sequence);
uint64_t base_address = module->base_address(); uint64_t base_address = module->base_address();
- printf("Module%c%s%c%s%c%s%c%s%c0x%08" PRIx64 "%c0x%08" PRIx64 "%c%d\n", - printf("Module%c%s%c%s%c%s%c%s%c0x%08" PRIx64 "%c0x%08" PRIx64 "%c%d\n",
+ printf("Module%c%s%c%s%c%s%c%s%c%s%c0x%08" PRIx64 "%c0x%08" PRIx64 "%c%d\n", + printf("Module%c%s%c%s%c%s%c%s%c0x%08" PRIx64 "%c0x%08" PRIx64 "%c%d%c%s\n",
kOutputSeparator, kOutputSeparator,
StripSeparator(PathnameStripper::File(module->code_file())).c_str(), StripSeparator(PathnameStripper::File(module->code_file())).c_str(),
+ kOutputSeparator,
+ StripSeparator(PathnameStripper::File(module->code_identifier())).c_str(),
kOutputSeparator, StripSeparator(module->version()).c_str(), kOutputSeparator, StripSeparator(module->version()).c_str(),
@@ -778,7 +778,9 @@
kOutputSeparator, base_address,
kOutputSeparator, base_address + module->size() - 1,
kOutputSeparator, kOutputSeparator,
StripSeparator(PathnameStripper::File(module->debug_file())).c_str(), - main_module != NULL && base_address == main_address ? 1 : 0);
+ main_module != NULL && base_address == main_address ? 1 : 0),
+ kOutputSeparator,
+ StripSeparator(PathnameStripper::File(module->code_identifier())).c_str();
}
}