From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Mon, 16 Nov 2015 18:58:42 +0000 (+0100)
Subject: Print stack index in backtrace generator on Windows.
X-Git-Tag: dbus-1.11.0~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab28e34983dc96780b090c29a101c710826c63dc;p=thirdparty%2Fdbus.git

Print stack index in backtrace generator on Windows.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=92721
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
---

diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
index 5b59e4e60..d24deada9 100644
--- a/dbus/dbus-sysdeps-win.c
+++ b/dbus/dbus-sysdeps-win.c
@@ -2555,6 +2555,7 @@ static void dump_backtrace_for_thread(HANDLE hThread)
     STACKFRAME sf;
     CONTEXT context;
     DWORD dwImageType;
+    int i = 0;
 
     if (!pStackWalk)
         if (!init_backtrace())
@@ -2628,15 +2629,15 @@ static void dump_backtrace_for_thread(HANDLE hThread)
 
             if (!pSymGetModuleInfo(GetCurrentProcess(), sf.AddrPC.Offset,
                                    &ModuleInfo))
-                DPRINTF("1\t%p\n", (void*)sf.AddrPC.Offset);
+                DPRINTF("%3d %p\n", i++, (void*)sf.AddrPC.Offset);
             else
-                DPRINTF("2\t%s+0x%lx\n", ModuleInfo.ImageName,
+                DPRINTF("%3d %s+0x%lx\n", i++, ModuleInfo.ImageName,
                     sf.AddrPC.Offset - ModuleInfo.BaseOfImage);
         }
         else if (dwDisplacement)
-            DPRINTF("3\t%s+0x%lx\n", pSymbol->Name, dwDisplacement);
+            DPRINTF("%3d %s+0x%lx\n", i++, pSymbol->Name, dwDisplacement);
         else
-            DPRINTF("4\t%s\n", pSymbol->Name);
+            DPRINTF("%3d %s\n", i++, pSymbol->Name);
     }
 
     ResumeThread(hThread);