[mupen64plus-core] 111/310: Fix more warnings in printf_fixup.patch

[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 f5dc50e486e7440fe81c2ab4eea74d817644caf8
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sun Sep 4 13:03:55 2011 +0200

    Fix more warnings in printf_fixup.patch
---
 debian/changelog                  |  7 +++++++
 debian/patches/printf_fixup.patch | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d65a7bc..bd7c5ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mupen64plus-core (1.99.4+77+8bb0e6b3ae3a-2) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - Fix more warnings in printf_fixup.patch
+
+ -- Sven Eckelmann <sven at narfation.org>  Sun, 04 Sep 2011 12:54:18 +0200
+
 mupen64plus-core (1.99.4+77+8bb0e6b3ae3a-1) experimental; urgency=low
 
   * New upstream snapshot from revision 8bb0e6b3ae3a4020c12e601cfddf028fbb44a6ea
diff --git a/debian/patches/printf_fixup.patch b/debian/patches/printf_fixup.patch
index fd35cfb..c5da16f 100644
--- a/debian/patches/printf_fixup.patch
+++ b/debian/patches/printf_fixup.patch
@@ -90,3 +90,35 @@ index 98d564526c3186d4d02751e198e650af6a1d2831..547712ae03a94a127b86ca9ed7447f54
  void osd_delete_message(osd_message_t *);
  void osd_message_set_corner(osd_message_t *, enum osd_corner);
  void osd_message_set_static(osd_message_t *);
+diff --git a/src/osd/screenshot.cpp b/src/osd/screenshot.cpp
+index 2afb100f868c884a0a8a009f8a17dc06d74dd019..ac9d059091137f551ab97344fa9682290e100b86 100644
+--- a/src/osd/screenshot.cpp
++++ b/src/osd/screenshot.cpp
+@@ -62,7 +62,7 @@ static void user_write_data(png_structp png_write, png_bytep data, png_size_t le
+ {
+     FILE *fPtr = (FILE *) png_get_io_ptr(png_write);
+     if (fwrite(data, 1, length, fPtr) != length)
+-        DebugMessage(M64MSG_ERROR, "Failed to write %i bytes to screenshot file.", length);
++        DebugMessage(M64MSG_ERROR, "Failed to write %zi bytes to screenshot file.", length);
+ }
+ 
+ static void user_flush_data(png_structp png_write)
+diff --git a/src/r4300/recomp.c b/src/r4300/recomp.c
+index f20ac5dfcf2b464553fb19d6df83351a061e2c10..f41ca09813b04a86551b469bb28e0280236d9e58 100644
+--- a/src/r4300/recomp.c
++++ b/src/r4300/recomp.c
+@@ -2642,13 +2642,9 @@ void *malloc_exec(size_t size)
+    #endif
+ #endif
+ 
+-   int pagesize = sysconf(_SC_PAGE_SIZE);
+-   if (pagesize == -1)
+-       { DebugMessage(M64MSG_ERROR, "Memory error: couldn't determine system memory page size."); return NULL; }
+-
+    void *block = mmap(NULL, size, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+    if (block == MAP_FAILED)
+-       { DebugMessage(M64MSG_ERROR, "Memory error: couldn't allocate %i byte block of %zd-byte aligned RWX memory.", size, pagesize); return NULL; }
++       { DebugMessage(M64MSG_ERROR, "Memory error: couldn't allocate %zi byte block of aligned RWX memory.", size); return NULL; }
+ 
+    return block;
+ #else

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