Description: fix warnings generated with -Wformat-security
Author: Ilya Barygin <randomaction@ubuntu.com>
Reviewed-by: Alessio Treglia <alessio@debian.org>
Last-Update: 2011-11-29
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=647040
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=665097
---
 bse/bsecxxvalue.cc  |    4 ++--
 bse/bsemain.cc      |    4 ++--
 sfi/sfidl-parser.cc |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

--- beast.orig/sfi/sfidl-parser.cc
+++ beast/sfi/sfidl-parser.cc
@@ -238,7 +238,7 @@ Type Parser::typeOf (const String& type)
   if (isSequence (type))      return SEQUENCE;
   if (isRecord (type))	      return RECORD;
   if (isClass (type))	      return OBJECT;
-  g_error (("invalid type: " + type).c_str());
+  g_error ("%s", ("invalid type: " + type).c_str());
   return VOID;
 }
 
--- beast.orig/bse/bsemain.cc
+++ beast/bse/bsemain.cc
@@ -267,9 +267,9 @@ bse_init_core (void)
   /* dump device list */
   if (bse_main_args->dump_driver_list)
     {
-      g_printerr (_("\nAvailable PCM drivers:\n"));
+      g_printerr ("%s", _("\nAvailable PCM drivers:\n"));
       bse_device_dump_list (BSE_TYPE_PCM_DEVICE, "  ", TRUE, NULL, NULL);
-      g_printerr (_("\nAvailable MIDI drivers:\n"));
+      g_printerr ("%s", _("\nAvailable MIDI drivers:\n"));
       bse_device_dump_list (BSE_TYPE_MIDI_DEVICE, "  ", TRUE, NULL, NULL);
     }
 }
--- beast.orig/bse/bsecxxvalue.cc
+++ beast/bse/bsecxxvalue.cc
@@ -56,9 +56,9 @@ Value::get_string () const
 {
   GValue *v = gvalue();
   if (SFI_VALUE_HOLDS_STRING (v))
-    return sfi_value_get_string (v);
+    return (const SfiString) sfi_value_get_string (v);
   else if (SFI_VALUE_HOLDS_CHOICE (v))
-    return sfi_value_get_choice (v);
+    return (const SfiString) sfi_value_get_choice (v);
   else
     throw WrongTypeGValue (G_STRLOC);
 }
