From: Rémi Denis-Courmont <rdenis@simphalempin.com>
Date: Wed, 13 Aug 2008 18:41:48 +0000 (+0300)
Subject: Use %s even if all strings are currently free of percent characters
X-Git-Tag: 0.9.0~372
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=915ba6e04d51ff5502b3df87735af4172bcfdfa6;p=vlc

Use %s even if all strings are currently free of percent characters
---

diff --git a/include/vlc_demux.h b/include/vlc_demux.h
index 27909504f7..5b5c5829c2 100644
--- a/include/vlc_demux.h
+++ b/include/vlc_demux.h
@@ -174,7 +174,7 @@ static inline bool demux_IsForced( demux_t *p_demux, const char *psz_name )
 
 #define STANDARD_DEMUX_INIT_MSG( msg ) do { \
     DEMUX_INIT_COMMON();                    \
-    msg_Dbg( p_demux, msg ); } while(0)
+    msg_Dbg( p_demux, "%s", msg ); } while(0)
 
 #define DEMUX_BY_EXTENSION( ext ) \
     demux_t *p_demux = (demux_t *)p_this; \
diff --git a/include/vlc_interface.h b/include/vlc_interface.h
index 5c13eaa2ea..0fb7b6c851 100644
--- a/include/vlc_interface.h
+++ b/include/vlc_interface.h
@@ -132,7 +132,7 @@ VLC_EXPORT( int, __intf_Eject, ( vlc_object_t *, const char * ) );
          freopen( "CONOUT$", "w", stderr ); \
          freopen( "CONIN$", "r", stdin ); \
          } \
-         msg_Info( p_intf, COPYRIGHT_MESSAGE ); \
+         msg_Info( p_intf, "%s", COPYRIGHT_MESSAGE ); \
          msg_Info( p_intf, _("\nWarning: if you can't access the GUI " \
                              "anymore, open a command-line window, go to the " \
                              "directory where you installed VLC and run " \
diff --git a/modules/gui/skins2/src/logger.cpp b/modules/gui/skins2/src/logger.cpp
index 068d1374b0..b0b0b2210e 100644
--- a/modules/gui/skins2/src/logger.cpp
+++ b/modules/gui/skins2/src/logger.cpp
@@ -62,12 +62,12 @@ void Logger::destroy( intf_thread_t *pIntf )
 
 void Logger::error( const string &rMsg )
 {
-    msg_Err( getIntf(), rMsg.c_str() );
+    msg_Err( getIntf(), "%s", rMsg.c_str() );
 }
 
 
 void Logger::warn( const string &rMsg )
 {
-    msg_Warn( getIntf(), rMsg.c_str() );
+    msg_Warn( getIntf(), "%s", rMsg.c_str() );
 }
 
diff --git a/src/libvlc.c b/src/libvlc.c
index f982be8640..8c1f907178 100644
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -227,7 +227,7 @@ libvlc_int_t * libvlc_InternalCreate( void )
 #endif
 
     /* Announce who we are - Do it only for first instance ? */
-    msg_Dbg( p_libvlc, COPYRIGHT_MESSAGE );
+    msg_Dbg( p_libvlc, "%s", COPYRIGHT_MESSAGE );
     msg_Dbg( p_libvlc, "libvlc was configured with %s", CONFIGURE_LINE );
 
     /* Initialize mutexes */