[Libreoffice-commits] core.git: external/breakpad

[Markus Mohrhard]

 external/breakpad/breakpad-stackwalk.patch.1 |   30 ++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

New commits:
commit 74c01bb89faa1c900fb9b63a04c469a8166996d9
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Jun 27 02:14:58 2016 +0200

    better use a backward compatible way to change the output
    
    Change-Id: If5829e321db8af1f09cccafaf34a18343492f514

diff --git a/external/breakpad/breakpad-stackwalk.patch.1 b/external/breakpad/breakpad-stackwalk.patch.1
index 26803f1..9a3ce95 100644
--- a/external/breakpad/breakpad-stackwalk.patch.1
+++ b/external/breakpad/breakpad-stackwalk.patch.1
@@ -1,16 +1,32 @@
 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/src/processor/stackwalk_common.cc	2016-06-25 01:42:58.463821357 +0200
-@@ -767,9 +767,11 @@
+--- breakpad.org/src/processor/stackwalk_common.cc	2016-06-27 02:06:43.304932691 +0200
++++ breakpad/src/processor/stackwalk_common.cc	2016-06-27 02:10:22.815642476 +0200
+@@ -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) {
      const CodeModule *module = modules->GetModuleAtSequence(module_sequence);
      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%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,
             StripSeparator(PathnameStripper::File(module->code_file())).c_str(),
-+           kOutputSeparator,
-+           StripSeparator(PathnameStripper::File(module->code_identifier())).c_str(),
             kOutputSeparator, StripSeparator(module->version()).c_str(),
+@@ -778,7 +778,9 @@
+            kOutputSeparator, base_address,
+            kOutputSeparator, base_address + module->size() - 1,
             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();
+   }
+ }
+