[vlc-devel] commit: macosx: fixed some compilation warnings ( Felix Kühne )

[git version control]

vlc | branch: master | Felix Kühne <fpk at Bartleby.local> | Tue Aug 25 17:42:36 2009 +0200| [250f8123c45217ea5b3a41c918000f7cc73bfb5e] | committer: Felix Kühne 

macosx: fixed some compilation warnings

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

 modules/gui/macosx/controls.m     |   18 +++++++++---------
 modules/gui/macosx/simple_prefs.m |    2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/gui/macosx/controls.m b/modules/gui/macosx/controls.m
index 3cf5c8d..c042eb9 100644
--- a/modules/gui/macosx/controls.m
+++ b/modules/gui/macosx/controls.m
@@ -207,12 +207,12 @@
     var_Set( p_playlist, "random", val );
     if( val.b_bool )
     {
-        vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Random On" ) );
+        vout_OSDMessage( p_intf, DEFAULT_CHAN, "%s", _( "Random On" ) );
         config_PutInt( p_playlist, "random", 1 );
     }
     else
     {
-        vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Random Off" ) );
+        vout_OSDMessage( p_intf, DEFAULT_CHAN, "%s", _( "Random Off" ) );
         config_PutInt( p_playlist, "random", 0 );
     }
 
@@ -276,7 +276,7 @@
         config_PutInt( p_playlist, "loop", 0 );
  
         /* show the change */
-        vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat One" ) );
+        vout_OSDMessage( p_intf, DEFAULT_CHAN, "%s", _( "Repeat One" ) );
     }
     else if( repeating.b_bool && !looping.b_bool )
     {
@@ -292,7 +292,7 @@
         config_PutInt( p_playlist, "loop", 1 );
  
         /* show the change */
-        vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat All" ) );
+        vout_OSDMessage( p_intf, DEFAULT_CHAN, "%s", _( "Repeat All" ) );
     }
     else
     {
@@ -308,7 +308,7 @@
         config_PutInt( p_playlist, "loop", 0 );
  
         /* show the change */
-        vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat Off" ) );
+        vout_OSDMessage( p_intf, DEFAULT_CHAN, "%s", _( "Repeat Off" ) );
     }
 
     /* communicate with core and the main intf loop */
@@ -336,12 +336,12 @@
     var_Set( p_playlist, "repeat", val );
     if( val.b_bool )
     {
-        vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat One" ) );
+        vout_OSDMessage( p_intf, DEFAULT_CHAN, "%s", _( "Repeat One" ) );
         config_PutInt( p_playlist, "repeat", 1 );
     }
     else
     {
-        vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat Off" ) );
+        vout_OSDMessage( p_intf, DEFAULT_CHAN, "%s", _( "Repeat Off" ) );
         config_PutInt( p_playlist, "repeat", 0 );
     }
  
@@ -365,12 +365,12 @@
     var_Set( p_playlist, "loop", val );
     if( val.b_bool )
     {
-        vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat All" ) );
+        vout_OSDMessage( p_intf, DEFAULT_CHAN, "%s", _( "Repeat All" ) );
         config_PutInt( p_playlist, "loop", 1 );
     }
     else
     {
-        vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat Off" ) );
+        vout_OSDMessage( p_intf, DEFAULT_CHAN, "%s", _( "Repeat Off" ) );
         config_PutInt( p_playlist, "loop", 0 );
     }
 
diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m
index 9a4939c..5bcfd33 100644
--- a/modules/gui/macosx/simple_prefs.m
+++ b/modules/gui/macosx/simple_prefs.m
@@ -328,7 +328,7 @@ static inline char * __config_GetLabel( vlc_object_t *p_this, const char *psz_na
     else if( p_config->psz_text )
         return p_config->psz_text;
     else
-        msg_Warn( p_this, "option %s does not include any help" );
+        msg_Warn( p_this, "option %s does not include any help", psz_name );
 
     return NULL;
 }