[mupen64plus-core] 165/310: Print function pointer using %p instead of %x

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-core.

commit d16ced6b662b40843be457343f932d02fa5fbcf4
Author: Sven Eckelmann <sven at narfation.org>
Date:   Mon May 28 22:40:37 2012 +0200

    Print function pointer using %p instead of %x
---
 debian/changelog                             |  2 ++
 debian/patches/printf_function_pointer.patch | 54 ++++++++++++++++++++++++++++
 debian/patches/series                        |  1 +
 3 files changed, 57 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c9b2f1f..a08d7ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ mupen64plus-core (1.99.5-6) UNRELEASED; urgency=low
 
   * debian/patches:
     - Add unused_bdslot.patch, Remove unused variable bdslot
+    - Add printf_function_pointer.patch, Print function pointer using %p instead
+      of %x
 
  -- Sven Eckelmann <sven at narfation.org>  Sat, 09 Jun 2012 00:28:40 +0200
 
diff --git a/debian/patches/printf_function_pointer.patch b/debian/patches/printf_function_pointer.patch
new file mode 100644
index 0000000..04c2bb4
--- /dev/null
+++ b/debian/patches/printf_function_pointer.patch
@@ -0,0 +1,54 @@
+Description: Print function pointer using %p instead of %x
+Origin: upstream, https://bitbucket.org/richard42/mupen64plus-core/changeset/3fe78796a127
+Author: Sven Eckelmann <sven at narfation.org>
+
+---
+diff --git a/src/debugger/dbg_memory.c b/src/debugger/dbg_memory.c
+index ef2f16375d735291370900cddec9549df4e01e8c..b2c8b63d50dd3b5ad0aa9746d0619e6801a70272 100644
+--- a/src/debugger/dbg_memory.c
++++ b/src/debugger/dbg_memory.c
+@@ -436,7 +436,7 @@ int get_memory_type(uint32 addr){
+   else if((readfunc == read_mi) || (readfunc == read_mi_break))
+     return MEM_MI;
+   else
+-    DebugMessage(M64MSG_ERROR, "Unknown memory type in debugger get_memory_type(): %x", readfunc);
++    DebugMessage(M64MSG_ERROR, "Unknown memory type in debugger get_memory_type(): %p", readfunc);
+   return MEM_NOMEM;
+ }
+ 
+@@ -558,7 +558,7 @@ void activate_memory_break_read(uint32 addr) {
+         readmemd[addr >> 16] = read_romd_break;
+    }
+    else
+-        DebugMessage(M64MSG_ERROR, "Unknown memory type in debugger activate_memory_break_read(): %x", readfunc);
++        DebugMessage(M64MSG_ERROR, "Unknown memory type in debugger activate_memory_break_read(): %p", readfunc);
+ }
+ 
+ void deactivate_memory_break_read(uint32 addr) {
+@@ -679,7 +679,7 @@ void deactivate_memory_break_read(uint32 addr) {
+         readmemd[addr >> 16] = read_romd;
+     }
+     else
+-        DebugMessage(M64MSG_ERROR, "Unknown memory type in debugger deactivate_memory_break_read(): %x", readfunc);
++        DebugMessage(M64MSG_ERROR, "Unknown memory type in debugger deactivate_memory_break_read(): %p", readfunc);
+ }
+ 
+ void activate_memory_break_write(uint32 addr) {
+@@ -806,7 +806,7 @@ void activate_memory_break_write(uint32 addr) {
+         writememd[addr >> 16] = write_nothingd_break;
+    }
+    else
+-        DebugMessage(M64MSG_ERROR, "Unknown memory type in debugger activate_memory_break_write(): %x", writefunc);
++        DebugMessage(M64MSG_ERROR, "Unknown memory type in debugger activate_memory_break_write(): %p", writefunc);
+ }
+ 
+ void deactivate_memory_break_write(uint32 addr) {
+@@ -933,7 +933,7 @@ void deactivate_memory_break_write(uint32 addr) {
+         writememd[addr >> 16] = write_nothingd;
+     }
+     else
+-        DebugMessage(M64MSG_ERROR, "Unknown memory type in debugger deactivate_memory_break_write(): %x", writefunc);
++        DebugMessage(M64MSG_ERROR, "Unknown memory type in debugger deactivate_memory_break_write(): %p", writefunc);
+ }
+ 
+ /* Following are the breakpoint functions for memory access calls.  See debugger/memory.h
diff --git a/debian/patches/series b/debian/patches/series
index a9fd14f..158dd30 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ rjump_gcc47.patch
 debugger_api.patch
 disable_recompiler_disassembler.patch
 unused_bdslot.patch
+printf_function_pointer.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-core.git