[vlc-devel] commit: Format string (make gcc happy) ( Rémi Denis-Courmont )

git version control git at videolan.org
Tue Mar 31 17:44:07 CEST 2009


vlc | branch: master | Rémi Denis-Courmont <remi.denis-courmont at nokia.com> | Tue Mar 24 23:23:41 2009 +0200| [8c7ec7a41e125ba2c9682cba48e43756dc6c6148] | committer: Rémi Denis-Courmont 

Format string (make gcc happy)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8c7ec7a41e125ba2c9682cba48e43756dc6c6148
---

 src/input/decoder.c |    6 +++---
 src/libvlc.c        |    6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/input/decoder.c b/src/input/decoder.c
index 302db7c..1667d32 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -275,7 +275,7 @@ decoder_t *input_DecoderNew( input_thread_t *p_input,
         if( p_dec == NULL )
         {
             msg_Err( p_input, "could not create packetizer" );
-            dialog_Fatal( p_input, _("Streaming / Transcoding failed"),
+            dialog_Fatal( p_input, _("Streaming / Transcoding failed"), "%s",
                           _("VLC could not open the packetizer module.") );
             return NULL;
         }
@@ -288,7 +288,7 @@ decoder_t *input_DecoderNew( input_thread_t *p_input,
         if( p_dec == NULL )
         {
             msg_Err( p_input, "could not create decoder" );
-            dialog_Fatal( p_input, _("Streaming / Transcoding failed"),
+            dialog_Fatal( p_input, _("Streaming / Transcoding failed"), "%s",
                           _("VLC could not open the decoder module.") );
             return NULL;
         }
@@ -441,7 +441,7 @@ int input_DecoderSetCcState( decoder_t *p_dec, bool b_decode, int i_channel )
         if( !p_cc )
         {
             msg_Err( p_dec, "could not create decoder" );
-            dialog_Fatal( p_dec, _("Streaming / Transcoding failed"),
+            dialog_Fatal( p_dec, _("Streaming / Transcoding failed"), "%s",
                           _("VLC could not open the decoder module.") );
             return VLC_EGENERIC;
         }
diff --git a/src/libvlc.c b/src/libvlc.c
index 49f4ff5..1281f62 100644
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -1158,7 +1158,9 @@ int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc, char const *psz_module )
                 psz_module = "dummy";
             else
 #endif
-                msg_Info( p_libvlc, _("Running vlc with the default interface. Use 'cvlc' to use vlc without interface.") );
+                msg_Info( p_libvlc, "%s",
+                          _("Running vlc with the default interface. "
+                            "Use 'cvlc' to use vlc without interface.") );
         }
         free( psz_interface );
     }
@@ -1974,7 +1976,7 @@ static void Version( void )
     utf8_fprintf( stdout, _("Compiled by %s@%s.%s\n"),
              VLC_CompileBy(), VLC_CompileHost(), VLC_CompileDomain() );
     utf8_fprintf( stdout, _("Compiler: %s\n"), VLC_Compiler() );
-    utf8_fprintf( stdout, LICENSE_MSG );
+    utf8_fprintf( stdout, "%s", LICENSE_MSG );
 
 #ifdef WIN32        /* Pause the console because it's destroyed when we exit */
     PauseConsole();




More information about the vlc-devel mailing list