[beast/devel: 4/6] BSE: bseserver.cc: work around format-security warnings



commit 9f2cb2073db9535b9a0423b25ba90dad5f7f17ee
Author: Tim Janik <timj gnu org>
Date:   Sun Jan 20 03:36:19 2013 +0100

    BSE: bseserver.cc: work around format-security warnings

 bse/bseserver.cc |   38 +++++++++++++++++++-------------------
 1 files changed, 19 insertions(+), 19 deletions(-)
---
diff --git a/bse/bseserver.cc b/bse/bseserver.cc
index 426bb56..547233a 100644
--- a/bse/bseserver.cc
+++ b/bse/bseserver.cc
@@ -395,9 +395,9 @@ bse_server_require_pcm_input (BseServer *server)
       server->pcm_input_checked = TRUE;
       if (!BSE_DEVICE_READABLE (server->pcm_device))
         sfi_msg_display (SFI_MSG_WARNING,
-                         SFI_MSG_TITLE (_("Recording Audio Input")),
-                         SFI_MSG_TEXT1 (_("Failed to start recording from audio device.")),
-                         SFI_MSG_TEXT2 (_("An audio project is in use which processes an audio input signal, but the audio device "
+                         SFI_MSG_TITLE ("%s", _("Recording Audio Input")),
+                         SFI_MSG_TEXT1 ("%s", _("Failed to start recording from audio device.")),
+                         SFI_MSG_TEXT2 ("%s", _("An audio project is in use which processes an audio input signal, but the audio device "
                                           "has not been opened in recording mode. "
                                           "An audio signal of silence will be used instead of a recorded signal, "
                                           "so playback operation may produce results not actually intended "
@@ -406,7 +406,7 @@ bse_server_require_pcm_input (BseServer *server)
                                         BSE_DEVICE (server->pcm_device)->open_device_name,
                                         BSE_DEVICE_GET_CLASS (server->pcm_device)->driver_name,
                                         BSE_DEVICE (server->pcm_device)->open_device_args),
-                         SFI_MSG_CHECK (_("Show messages about audio input problems")));
+                         SFI_MSG_CHECK ("%s", _("Show messages about audio input problems")));
     }
 }
 typedef struct {
@@ -444,12 +444,12 @@ server_open_pcm_device (BseServer *server,
                                                                pcm_request_callback, &pr, error ? NULL : &error);
   if (!server->pcm_device)
     sfi_msg_display (SFI_MSG_ERROR,
-                     SFI_MSG_TITLE (_("No Audio")),
-                     SFI_MSG_TEXT1 (_("No available audio device was found.")),
-                     SFI_MSG_TEXT2 (_("No available audio device could be found and opened successfully. "
-                                      "Sorry, no fallback selection can be made for audio devices, giving up.")),
+                     SFI_MSG_TITLE ("%s", _("No Audio")),
+                     SFI_MSG_TEXT1 ("%s", _("No available audio device was found.")),
+                     SFI_MSG_TEXT2 ("%s", _("No available audio device could be found and opened successfully. "
+                                            "Sorry, no fallback selection can be made for audio devices, giving up.")),
                      SFI_MSG_TEXT3 (_("Failed to open PCM devices: %s"), bse_error_blurb (error)),
-                     SFI_MSG_CHECK (_("Show messages about PCM device selections problems")));
+                     SFI_MSG_CHECK ("%s", _("Show messages about PCM device selections problems")));
   server->pcm_input_checked = FALSE;
   return server->pcm_device ? BSE_ERROR_NONE : error;
 }
@@ -466,12 +466,12 @@ server_open_midi_device (BseServer *server)
       sfi_ring_free (ring);
       if (server->midi_device)
         sfi_msg_display (SFI_MSG_WARNING,
-                         SFI_MSG_TITLE (_("No MIDI")),
-                         SFI_MSG_TEXT1 (_("MIDI input or oputput is not available.")),
-                         SFI_MSG_TEXT2 (_("No available MIDI device could be found and opened successfully. "
-                                          "Reverting to null device, no MIDI events will be received or sent.")),
+                         SFI_MSG_TITLE ("%s", _("No MIDI")),
+                         SFI_MSG_TEXT1 ("%s", _("MIDI input or oputput is not available.")),
+                         SFI_MSG_TEXT2 ("%s", _("No available MIDI device could be found and opened successfully. "
+                                                "Reverting to null device, no MIDI events will be received or sent.")),
                          SFI_MSG_TEXT3 (_("Failed to open MIDI devices: %s"), bse_error_blurb (error)),
-                         SFI_MSG_CHECK (_("Show messages about MIDI device selections problems")));
+                         SFI_MSG_CHECK ("%s", _("Show messages about MIDI device selections problems")));
     }
   return server->midi_device ? BSE_ERROR_NONE : error;
 }
@@ -521,12 +521,12 @@ bse_server_open_devices (BseServer *self)
 	  if (error)
 	    {
               sfi_msg_display (SFI_MSG_ERROR,
-                               SFI_MSG_TITLE (_("Start Disk Recording")),
-                               SFI_MSG_TEXT1 (_("Failed to start recording to disk.")),
-                               SFI_MSG_TEXT2 (_("An error occoured while opening the recording file, selecting a different "
-                                                "file might fix this situation.")),
+                               SFI_MSG_TITLE ("%s", _("Start Disk Recording")),
+                               SFI_MSG_TEXT1 ("%s", _("Failed to start recording to disk.")),
+                               SFI_MSG_TEXT2 ("%s", _("An error occoured while opening the recording file, selecting a different "
+                                                      "file might fix this situation.")),
                                SFI_MSG_TEXT3 (_("Failed to open file \"%s\" for output: %s"), self->wave_file, bse_error_blurb (error)),
-                               SFI_MSG_CHECK (_("Show recording file errors")));
+                               SFI_MSG_CHECK ("%s", _("Show recording file errors")));
 	      g_object_unref (self->pcm_writer);
 	      self->pcm_writer = NULL;
 	    }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]