Sophie

Sophie

distrib > Mandriva > 2010.1 > i586 > by-pkgid > 59365939758f0a27042f0b6c390f2db0 > files > 1

bochs-2.4.2-1mdv2010.1.src.rpm

diff -p -up bochs-2.4.2/gui/gtk_enh_dbg_osdep.cc.format_string~ bochs-2.4.2/gui/gtk_enh_dbg_osdep.cc
--- bochs-2.4.2/gui/gtk_enh_dbg_osdep.cc.format_string~	2010-02-27 20:57:50.528927626 +0100
+++ bochs-2.4.2/gui/gtk_enh_dbg_osdep.cc	2010-02-27 21:00:41.097930493 +0100
@@ -987,7 +987,7 @@ void DispMessage(const char *msg, const 
         GTK_DIALOG_DESTROY_WITH_PARENT,
         GTK_MESSAGE_WARNING,
         GTK_BUTTONS_OK,
-        msg);
+        "%s", msg);
     gtk_window_set_title(GTK_WINDOW(dialog), title);
     gtk_dialog_run(GTK_DIALOG(dialog));
     gtk_widget_destroy(dialog);
diff -p -up bochs-2.4.2/iodev/floppy.cc.format_string~ bochs-2.4.2/iodev/floppy.cc
--- bochs-2.4.2/iodev/floppy.cc.format_string~	2010-02-27 20:57:26.504927531 +0100
+++ bochs-2.4.2/iodev/floppy.cc	2010-02-27 20:59:48.686948579 +0100
@@ -681,7 +681,7 @@ void bx_floppy_ctrl_c::floppy_command(vo
   for (i=0; i<BX_FD_THIS s.command_size; i++) {
     p += sprintf(p, "[%02x] ", (unsigned) BX_FD_THIS s.command[i]);
   }
-  BX_DEBUG((buf));
+  BX_DEBUG(("%s", buf));
 
   BX_FD_THIS s.pending_command = BX_FD_THIS s.command[0];
   switch (BX_FD_THIS s.pending_command) {
@@ -1807,7 +1807,7 @@ void bx_floppy_ctrl_c::enter_result_phas
   for (i=0; i<BX_FD_THIS s.result_size; i++) {
     p += sprintf(p, "[%02x] ", (unsigned) BX_FD_THIS s.result[i]);
   }
-  BX_DEBUG((buf));
+  BX_DEBUG(("%s", buf));
 }
 
 void bx_floppy_ctrl_c::enter_idle_phase(void)
diff -p -up bochs-2.4.2/iodev/hdimage.cc.format_string~ bochs-2.4.2/iodev/hdimage.cc
--- bochs-2.4.2/iodev/hdimage.cc.format_string~	2010-02-27 20:57:38.528942830 +0100
+++ bochs-2.4.2/iodev/hdimage.cc	2010-02-27 21:00:04.315965705 +0100
@@ -611,7 +611,7 @@ void sparse_image_t::panic(const char * 
   {
     snprintf(buffer, sizeof(buffer), "error with sparse disk image %s - %s", pathname, message);
   }
-  BX_PANIC((buffer));
+  BX_PANIC(("%s", buffer));
 }
 
 ssize_t sparse_image_t::write (const void* buf, size_t count)