[mupen64plus-core] 45/310: Correct usage of printf format strings

[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 5d51a03a693196d0e3933f7cb67ba39b237add4e
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Thu Sep 9 13:11:05 2010 +0200

    Correct usage of printf format strings
---
 debian/changelog                  |  1 +
 debian/patches/printf_fixup.patch | 88 +++++++++++++++++++++++++++++++++++++++
 debian/patches/series             |  1 +
 3 files changed, 90 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 631a9e7..b60205d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ mupen64plus-core (1.99.4~hg20100511-1) UNRELEASED; urgency=low
     - Rebase default-optimisations.patch, dejavu-font.patch and path_max.patch
       against 1.99.4~hg20100511
     - Add hurd_os.patch, Add GNU/Hurd as operating system with "linux" userland
+    - Add printf_fixup.patch, Correct usage of printf format strings
   * Convert to 3.0 (quilt) source format
   * debian/control:
     - Remove unneeded build dependency to quilt
diff --git a/debian/patches/printf_fixup.patch b/debian/patches/printf_fixup.patch
new file mode 100644
index 0000000..4a2a726
--- /dev/null
+++ b/debian/patches/printf_fixup.patch
@@ -0,0 +1,88 @@
+
+
+---
+diff --git a/src/api/callbacks.h b/src/api/callbacks.h
+index 4d4a490e9d84a997e709db90b717449a9f54e01d..33c63d8f8aa4af12ad92c727988efe0d2c99ed05 100644
+--- a/src/api/callbacks.h
++++ b/src/api/callbacks.h
+@@ -35,7 +35,7 @@ typedef void (*ptr_StateCallback)(void *Context, m64p_core_param param_type, int
+ /* Functions for use by the Core, to send information back to the front-end app */
+ extern m64p_error SetDebugCallback(ptr_DebugCallback pFunc, void *Context);
+ extern m64p_error SetStateCallback(ptr_StateCallback pFunc, void *Context);
+-extern void       DebugMessage(int level, const char *message, ...);
++extern void       DebugMessage(int level, const char *message, ...) __attribute__ ((format (printf, 2, 3)));
+ extern void       StateChanged(m64p_core_param param_type, int new_value);
+ 
+ #endif /* API_CALLBACKS_H */
+diff --git a/src/debugger/dbg_decoder.c b/src/debugger/dbg_decoder.c
+index 30bef2ab3e341e1705db9da91f0f4272df718591..d5bf75c25061fd34c4d08298e1746c6f05cb8690 100644
+--- a/src/debugger/dbg_decoder.c
++++ b/src/debugger/dbg_decoder.c
+@@ -228,6 +228,11 @@ lookup_rel_lo16 ( struct r4k_dis_t * state,
+ static int
+ db_printf ( struct r4k_dis_t * state,
+             char * fmt, 
++            ...                       ) __attribute__ ((format (printf, 2, 3)));
++
++static int
++db_printf ( struct r4k_dis_t * state,
++            char * fmt, 
+             ...                       )
+ {
+     int l;
+diff --git a/src/main/main.c b/src/main/main.c
+index c2bef93c8dae9a1173e915bbb40fd7dcc1bf1f9c..1ce8a6d5542349b3cf05a0c9aa6fa19de6caa9b3 100644
+--- a/src/main/main.c
++++ b/src/main/main.c
+@@ -106,9 +106,9 @@ void main_message(m64p_msg_level level, unsigned int corner, const char *format,
+ 
+     /* send message to on-screen-display if enabled */
+     if (ConfigGetParamBool(g_CoreConfig, "OnScreenDisplay"))
+-        osd_new_message((enum osd_corner) corner, buffer);
++        osd_new_message((enum osd_corner) corner, "%s", buffer);
+     /* send message to front-end */
+-    DebugMessage(level, buffer);
++    DebugMessage(level, "%s", buffer);
+ }
+ 
+ 
+@@ -291,9 +291,9 @@ void main_draw_volume_osd(void)
+ 
+     // create a new message or update an existing one
+     if (l_msgVol != NULL)
+-        osd_update_message(l_msgVol, msgString);
++        osd_update_message(l_msgVol, "%s", msgString);
+     else
+-        l_msgVol = osd_new_message(OSD_MIDDLE_CENTER, msgString);
++        l_msgVol = osd_new_message(OSD_MIDDLE_CENTER, "%s", msgString);
+ }
+ 
+ /* this function could be called as a result of a keypress, joystick/button movement,
+diff --git a/src/main/main.h b/src/main/main.h
+index c5f0b9a594cadc399327d269a30525a52276de41..8d7697c80efb775fced671acbb57a9009309340c 100644
+--- a/src/main/main.h
++++ b/src/main/main.h
+@@ -39,7 +39,7 @@ void new_frame(void);
+ void new_vi(void);
+ 
+ void main_set_core_defaults(void);
+-void main_message(m64p_msg_level level, unsigned int osd_corner, const char *format, ...);
++void main_message(m64p_msg_level level, unsigned int osd_corner, const char *format, ...) __attribute__ ((format (printf, 3, 4)));
+ 
+ m64p_error main_run(void);
+ void main_stop(void);
+diff --git a/src/osd/osd.h b/src/osd/osd.h
+index 46184f05009ab86f072aaca552e033b39f390c19..b331201f5e726665aee8c4a211e12cb0841b5ec8 100644
+--- a/src/osd/osd.h
++++ b/src/osd/osd.h
+@@ -86,8 +86,8 @@ extern "C" {
+ void osd_init(int width, int height);
+ void osd_exit(void);
+ void osd_render(void);
+-osd_message_t * osd_new_message(enum osd_corner, const char *, ...);
+-void osd_update_message(osd_message_t *, const char *, ...);
++osd_message_t * osd_new_message(enum osd_corner, const char *, ...) __attribute__ ((format (printf, 2, 3)));
++void osd_update_message(osd_message_t *, const char *, ...) __attribute__ ((format (printf, 2, 3)));
+ 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/debian/patches/series b/debian/patches/series
index 7ac99ce..9ea6570 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ default-optimisations.patch
 dejavu-font.patch
 hurd_os.patch
 path_max.patch
+printf_fixup.patch

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