Skip to content

V
vlc-gpu
Commit 946a8e91 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Fix format security warnings (fixes: #2857) 

(cherry picked from commit d323c4eeedd835ce126579c6131a7919255b76c1)

Conflicts:

	modules/control/hotkeys.c
Signed-off-by: default avatarRémi Denis-Courmont <remi@remlab.net>
parent 28fd4de9
Show whitespace changes
Inline Side-by-side
Showing with 121 additions and 121 deletions
modules/access/dvb/access.c
View file @ 946a8e91
...@@ -937,7 +937,7 @@ static int ParseMRL( access_t *p_access ) ...@@ -937,7 +937,7 @@ static int ParseMRL( access_t *p_access )
{ {
msg_Err( p_access, "the DVB input old syntax is deprecated, use vlc " msg_Err( p_access, "the DVB input old syntax is deprecated, use vlc "
"-p dvb to see an explanation of the new syntax" ); "-p dvb to see an explanation of the new syntax" );
dialog_FatalWait( p_access, _("Input syntax is deprecated"), dialog_FatalWait( p_access, _("Input syntax is deprecated"), "%s",
_("The given syntax is deprecated. Run \"vlc -p dvb\" to see an " \ _("The given syntax is deprecated. Run \"vlc -p dvb\" to see an " \
"explanation of the new syntax.") ); "explanation of the new syntax.") );
free( psz_dup ); free( psz_dup );
......
modules/access/dvdnav.c
View file @ 946a8e91
...@@ -312,7 +312,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -312,7 +312,7 @@ static int Open( vlc_object_t *p_this )
if( dvdnav_title_play( p_sys->dvdnav, 1 ) != DVDNAV_STATUS_OK ) if( dvdnav_title_play( p_sys->dvdnav, 1 ) != DVDNAV_STATUS_OK )
{ {
msg_Err( p_demux, "cannot set title (can't decrypt DVD?)" ); msg_Err( p_demux, "cannot set title (can't decrypt DVD?)" );
dialog_Fatal( p_demux, _("Playback failure"), dialog_Fatal( p_demux, _("Playback failure"), "%s",
_("VLC cannot set the DVD's title. It possibly " _("VLC cannot set the DVD's title. It possibly "
"cannot decrypt the entire disc.") ); "cannot decrypt the entire disc.") );
dvdnav_close( p_sys->dvdnav ); dvdnav_close( p_sys->dvdnav );
......
modules/access/mtp.c
View file @ 946a8e91
...@@ -215,7 +215,7 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) ...@@ -215,7 +215,7 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len )
default: default:
msg_Err( p_access, "read failed (%m)" ); msg_Err( p_access, "read failed (%m)" );
dialog_Fatal( p_access, _( "File reading failed" ), dialog_Fatal( p_access, _( "File reading failed" ), "%s",
_( "VLC could not read the file." ) ); _( "VLC could not read the file." ) );
p_access->info.b_eof = true; p_access->info.b_eof = true;
return 0; return 0;
......
modules/audio_output/alsa.c
View file @ 946a8e91
...@@ -323,7 +323,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -323,7 +323,7 @@ static int Open( vlc_object_t *p_this )
if( (psz_device = config_GetPsz( p_aout, "alsa-audio-device" )) == NULL ) if( (psz_device = config_GetPsz( p_aout, "alsa-audio-device" )) == NULL )
{ {
msg_Err( p_aout, "no audio device given (maybe \"default\" ?)" ); msg_Err( p_aout, "no audio device given (maybe \"default\" ?)" );
dialog_Fatal( p_aout, _("No Audio Device"), dialog_Fatal( p_aout, _("No Audio Device"), "%s",
_("No audio device name was given. You might want to " \ _("No audio device name was given. You might want to " \
"enter \"default\".") ); "enter \"default\".") );
free( p_sys ); free( p_sys );
......
modules/codec/avcodec/encoder.c
View file @ 946a8e91
...@@ -678,7 +678,7 @@ int OpenEncoder( vlc_object_t *p_this ) ...@@ -678,7 +678,7 @@ int OpenEncoder( vlc_object_t *p_this )
msg_Err( p_enc, "cannot open encoder" ); msg_Err( p_enc, "cannot open encoder" );
dialog_Fatal( p_enc, dialog_Fatal( p_enc,
_("Streaming / Transcoding failed"), _("Streaming / Transcoding failed"),
_("VLC could not open the encoder.") ); "%s", _("VLC could not open the encoder.") );
free( p_sys ); free( p_sys );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -687,7 +687,7 @@ int OpenEncoder( vlc_object_t *p_this ) ...@@ -687,7 +687,7 @@ int OpenEncoder( vlc_object_t *p_this )
{ {
msg_Err( p_enc, "cannot open encoder" ); msg_Err( p_enc, "cannot open encoder" );
dialog_Fatal( p_enc, _("Streaming / Transcoding failed"), dialog_Fatal( p_enc, _("Streaming / Transcoding failed"),
_("VLC could not open the encoder.") ); "%s", _("VLC could not open the encoder.") );
free( p_sys ); free( p_sys );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
......
modules/control/hotkeys.c
View file @ 946a8e91
...@@ -174,7 +174,7 @@ static int PutAction( intf_thread_t *p_intf, int i_action ) ...@@ -174,7 +174,7 @@ static int PutAction( intf_thread_t *p_intf, int i_action )
libvlc_Quit( p_intf->p_libvlc ); libvlc_Quit( p_intf->p_libvlc );
ClearChannels( p_intf, p_vout ); ClearChannels( p_intf, p_vout );
vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Quit" ) ); vout_OSDMessage( p_intf, DEFAULT_CHAN, "%s", _( "Quit" ) );
break; break;
/* Volume and audio actions */ /* Volume and audio actions */
...@@ -563,7 +563,7 @@ static int PutAction( intf_thread_t *p_intf, int i_action ) ...@@ -563,7 +563,7 @@ static int PutAction( intf_thread_t *p_intf, int i_action )
{ {
var_SetFloat( p_vout, "scale", 1.0 ); var_SetFloat( p_vout, "scale", 1.0 );
vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN, vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
_("Zooming reset") ); "%s", _("Zooming reset") );
} }
else else
{ {
...@@ -571,10 +571,10 @@ static int PutAction( intf_thread_t *p_intf, int i_action ) ...@@ -571,10 +571,10 @@ static int PutAction( intf_thread_t *p_intf, int i_action )
var_SetBool( p_vout, "autoscale", b_autoscale ); var_SetBool( p_vout, "autoscale", b_autoscale );
if( b_autoscale ) if( b_autoscale )
vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN, vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
_("Scaled to screen") ); "%s", _("Scaled to screen") );
else else
vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN, vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
_("Original Size") ); "%s", _("Original Size") );
} }
} }
else if( i_action == ACTIONID_SCALE_UP && p_vout ) else if( i_action == ACTIONID_SCALE_UP && p_vout )
...@@ -674,12 +674,12 @@ static int PutAction( intf_thread_t *p_intf, int i_action ) ...@@ -674,12 +674,12 @@ static int PutAction( intf_thread_t *p_intf, int i_action )
else if( i_action == ACTIONID_NEXT ) else if( i_action == ACTIONID_NEXT )
{ {
vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN, _("Next") ); vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN, "%s", _("Next") );
playlist_Next( p_playlist ); playlist_Next( p_playlist );
} }
else if( i_action == ACTIONID_PREV ) else if( i_action == ACTIONID_PREV )
{ {
vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN, vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN, "%s",
_("Previous") ); _("Previous") );
playlist_Prev( p_playlist ); playlist_Prev( p_playlist );
} }
...@@ -691,25 +691,25 @@ static int PutAction( intf_thread_t *p_intf, int i_action ) ...@@ -691,25 +691,25 @@ static int PutAction( intf_thread_t *p_intf, int i_action )
{ {
var_SetVoid( p_input, "frame-next" ); var_SetVoid( p_input, "frame-next" );
vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN, vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
_("Next frame") ); "%s", _("Next frame") );
} }
else if( i_action == ACTIONID_FASTER ) else if( i_action == ACTIONID_FASTER )
{ {
var_SetVoid( p_input, "rate-faster" ); var_SetVoid( p_input, "rate-faster" );
vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN, vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
_("Faster") ); "%s", _("Faster") );
} }
else if( i_action == ACTIONID_SLOWER ) else if( i_action == ACTIONID_SLOWER )
{ {
var_SetVoid( p_input, "rate-slower" ); var_SetVoid( p_input, "rate-slower" );
vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN, vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
_("Slower") ); "%s", _("Slower") );
} }
else if( i_action == ACTIONID_RATE_NORMAL ) else if( i_action == ACTIONID_RATE_NORMAL )
{ {
var_SetInteger( p_input, "rate", INPUT_RATE_DEFAULT ); var_SetInteger( p_input, "rate", INPUT_RATE_DEFAULT );
vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN, vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
_("1.00x") ); "%s", _("1.00x") );
} }
else if( i_action == ACTIONID_RATE_FASTER_FINE || else if( i_action == ACTIONID_RATE_FASTER_FINE ||
i_action == ACTIONID_RATE_SLOWER_FINE ) i_action == ACTIONID_RATE_SLOWER_FINE )
...@@ -736,7 +736,7 @@ static int PutAction( intf_thread_t *p_intf, int i_action ) ...@@ -736,7 +736,7 @@ static int PutAction( intf_thread_t *p_intf, int i_action )
char psz_msg[7+1]; char psz_msg[7+1];
snprintf( psz_msg, sizeof(psz_msg), _("%.2fx"), (double)INPUT_RATE_DEFAULT / i_rate ); snprintf( psz_msg, sizeof(psz_msg), _("%.2fx"), (double)INPUT_RATE_DEFAULT / i_rate );
vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN, psz_msg ); vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN, "%s", psz_msg );
} }
else if( i_action == ACTIONID_POSITION && b_seekable ) else if( i_action == ACTIONID_POSITION && b_seekable )
{ {
...@@ -852,9 +852,9 @@ static int PutAction( intf_thread_t *p_intf, int i_action ) ...@@ -852,9 +852,9 @@ static int PutAction( intf_thread_t *p_intf, int i_action )
const bool b_record = !var_GetBool( p_input, "record" ); const bool b_record = !var_GetBool( p_input, "record" );
if( b_record ) if( b_record )
vout_OSDMessage( p_intf, DEFAULT_CHAN, _("Recording") ); vout_OSDMessage( p_intf, DEFAULT_CHAN, "%s", _("Recording") );
else else
vout_OSDMessage( p_intf, DEFAULT_CHAN, _("Recording done") ); vout_OSDMessage( p_intf, DEFAULT_CHAN, "%s", _("Recording done") );
var_SetBool( p_input, "record", b_record ); var_SetBool( p_input, "record", b_record );
} }
} }
......
modules/control/rc.c
View file @ 946a8e91
...@@ -341,7 +341,7 @@ static int Activate( vlc_object_t *p_this ) ...@@ -341,7 +341,7 @@ static int Activate( vlc_object_t *p_this )
CONSOLE_INTRO_MSG; CONSOLE_INTRO_MSG;
#endif #endif
msg_rc( _("Remote control interface initialized. Type `help' for help.") ); msg_rc( "%s", _("Remote control interface initialized. Type `help' for help.") );
return VLC_SUCCESS; return VLC_SUCCESS;
} }
...@@ -848,98 +848,98 @@ static void Run( intf_thread_t *p_intf ) ...@@ -848,98 +848,98 @@ static void Run( intf_thread_t *p_intf )
static void Help( intf_thread_t *p_intf, bool b_longhelp) static void Help( intf_thread_t *p_intf, bool b_longhelp)
{ {
msg_rc(_("+----[ Remote control commands ]")); msg_rc("%s", _("+----[ Remote control commands ]"));
msg_rc( "| "); msg_rc( "| ");
msg_rc(_("| add XYZ . . . . . . . . . . . . add XYZ to playlist")); msg_rc("%s", _("| add XYZ . . . . . . . . . . . . add XYZ to playlist"));
msg_rc(_("| enqueue XYZ . . . . . . . . . queue XYZ to playlist")); msg_rc("%s", _("| enqueue XYZ . . . . . . . . . queue XYZ to playlist"));
msg_rc(_("| playlist . . . . . show items currently in playlist")); msg_rc("%s", _("| playlist . . . . . show items currently in playlist"));
msg_rc(_("| play . . . . . . . . . . . . . . . . . . play stream")); msg_rc("%s", _("| play . . . . . . . . . . . . . . . . . . play stream"));
msg_rc(_("| stop . . . . . . . . . . . . . . . . . . stop stream")); msg_rc("%s", _("| stop . . . . . . . . . . . . . . . . . . stop stream"));
msg_rc(_("| next . . . . . . . . . . . . . . next playlist item")); msg_rc("%s", _("| next . . . . . . . . . . . . . . next playlist item"));
msg_rc(_("| prev . . . . . . . . . . . . previous playlist item")); msg_rc("%s", _("| prev . . . . . . . . . . . . previous playlist item"));
msg_rc(_("| goto . . . . . . . . . . . . . . goto item at index")); msg_rc("%s", _("| goto . . . . . . . . . . . . . . goto item at index"));
msg_rc(_("| repeat [on|off] . . . . toggle playlist item repeat")); msg_rc("%s", _("| repeat [on|off] . . . . toggle playlist item repeat"));
msg_rc(_("| loop [on|off] . . . . . . . . . toggle playlist loop")); msg_rc("%s", _("| loop [on|off] . . . . . . . . . toggle playlist loop"));
msg_rc(_("| random [on|off] . . . . . . . toggle random jumping")); msg_rc("%s", _("| random [on|off] . . . . . . . toggle random jumping"));
msg_rc(_("| clear . . . . . . . . . . . . . . clear the playlist")); msg_rc("%s", _("| clear . . . . . . . . . . . . . . clear the playlist"));
msg_rc(_("| status . . . . . . . . . . . current playlist status")); msg_rc("%s", _("| status . . . . . . . . . . . current playlist status"));
msg_rc(_("| title [X] . . . . . . set/get title in current item")); msg_rc("%s", _("| title [X] . . . . . . set/get title in current item"));
msg_rc(_("| title_n . . . . . . . . next title in current item")); msg_rc("%s", _("| title_n . . . . . . . . next title in current item"));
msg_rc(_("| title_p . . . . . . previous title in current item")); msg_rc("%s", _("| title_p . . . . . . previous title in current item"));
msg_rc(_("| chapter [X] . . . . set/get chapter in current item")); msg_rc("%s", _("| chapter [X] . . . . set/get chapter in current item"));
msg_rc(_("| chapter_n . . . . . . next chapter in current item")); msg_rc("%s", _("| chapter_n . . . . . . next chapter in current item"));
msg_rc(_("| chapter_p . . . . previous chapter in current item")); msg_rc("%s", _("| chapter_p . . . . previous chapter in current item"));
msg_rc( "| "); msg_rc( "| ");
msg_rc(_("| seek X . . . seek in seconds, for instance `seek 12'")); msg_rc("%s", _("| seek X . . . seek in seconds, for instance `seek 12'"));
msg_rc(_("| pause . . . . . . . . . . . . . . . . toggle pause")); msg_rc("%s", _("| pause . . . . . . . . . . . . . . . . toggle pause"));
msg_rc(_("| fastforward . . . . . . . . . set to maximum rate")); msg_rc("%s", _("| fastforward . . . . . . . . . set to maximum rate"));
msg_rc(_("| rewind . . . . . . . . . . . . set to minimum rate")); msg_rc("%s", _("| rewind . . . . . . . . . . . . set to minimum rate"));
msg_rc(_("| faster . . . . . . . . . . faster playing of stream")); msg_rc("%s", _("| faster . . . . . . . . . . faster playing of stream"));
msg_rc(_("| slower . . . . . . . . . . slower playing of stream")); msg_rc("%s", _("| slower . . . . . . . . . . slower playing of stream"));
msg_rc(_("| normal . . . . . . . . . . normal playing of stream")); msg_rc("%s", _("| normal . . . . . . . . . . normal playing of stream"));
msg_rc(_("| f [on|off] . . . . . . . . . . . . toggle fullscreen")); msg_rc("%s", _("| f [on|off] . . . . . . . . . . . . toggle fullscreen"));
msg_rc(_("| info . . . . . information about the current stream")); msg_rc("%s", _("| info . . . . . information about the current stream"));
msg_rc(_("| stats . . . . . . . . show statistical information")); msg_rc("%s", _("| stats . . . . . . . . show statistical information"));
msg_rc(_("| get_time . . seconds elapsed since stream's beginning")); msg_rc("%s", _("| get_time . . seconds elapsed since stream's beginning"));
msg_rc(_("| is_playing . . . . 1 if a stream plays, 0 otherwise")); msg_rc("%s", _("| is_playing . . . . 1 if a stream plays, 0 otherwise"));
msg_rc(_("| get_title . . . . . the title of the current stream")); msg_rc("%s", _("| get_title . . . . . the title of the current stream"));
msg_rc(_("| get_length . . . . the length of the current stream")); msg_rc("%s", _("| get_length . . . . the length of the current stream"));
msg_rc( "| "); msg_rc( "| ");
msg_rc(_("| volume [X] . . . . . . . . . . set/get audio volume")); msg_rc("%s", _("| volume [X] . . . . . . . . . . set/get audio volume"));
msg_rc(_("| volup [X] . . . . . . . raise audio volume X steps")); msg_rc("%s", _("| volup [X] . . . . . . . raise audio volume X steps"));
msg_rc(_("| voldown [X] . . . . . . lower audio volume X steps")); msg_rc("%s", _("| voldown [X] . . . . . . lower audio volume X steps"));
msg_rc(_("| adev [X] . . . . . . . . . . . set/get audio device")); msg_rc("%s", _("| adev [X] . . . . . . . . . . . set/get audio device"));
msg_rc(_("| achan [X]. . . . . . . . . . set/get audio channels")); msg_rc("%s", _("| achan [X]. . . . . . . . . . set/get audio channels"));
msg_rc(_("| atrack [X] . . . . . . . . . . . set/get audio track")); msg_rc("%s", _("| atrack [X] . . . . . . . . . . . set/get audio track"));
msg_rc(_("| vtrack [X] . . . . . . . . . . . set/get video track")); msg_rc("%s", _("| vtrack [X] . . . . . . . . . . . set/get video track"));
msg_rc(_("| vratio [X] . . . . . . . set/get video aspect ratio")); msg_rc("%s", _("| vratio [X] . . . . . . . set/get video aspect ratio"));
msg_rc(_("| vcrop [X] . . . . . . . . . . . set/get video crop")); msg_rc("%s", _("| vcrop [X] . . . . . . . . . . . set/get video crop"));
msg_rc(_("| vzoom [X] . . . . . . . . . . . set/get video zoom")); msg_rc("%s", _("| vzoom [X] . . . . . . . . . . . set/get video zoom"));
msg_rc(_("| snapshot . . . . . . . . . . . . take video snapshot")); msg_rc("%s", _("| snapshot . . . . . . . . . . . . take video snapshot"));
msg_rc(_("| strack [X] . . . . . . . . . set/get subtitles track")); msg_rc("%s", _("| strack [X] . . . . . . . . . set/get subtitles track"));
msg_rc(_("| key [hotkey name] . . . . . . simulate hotkey press")); msg_rc("%s", _("| key [hotkey name] . . . . . . simulate hotkey press"));
msg_rc(_("| menu . . [on|off|up|down|left|right|select] use menu")); msg_rc("%s", _("| menu . . [on|off|up|down|left|right|select] use menu"));
msg_rc( "| "); msg_rc( "| ");
if (b_longhelp) if (b_longhelp)
{ {
msg_rc(_("| @name marq-marquee STRING . . overlay STRING in video")); msg_rc("%s", _("| @name marq-marquee STRING . . overlay STRING in video"));
msg_rc(_("| @name marq-x X . . . . . . . . . . . .offset from left")); msg_rc("%s", _("| @name marq-x X . . . . . . . . . . . .offset from left"));
msg_rc(_("| @name marq-y Y . . . . . . . . . . . . offset from top")); msg_rc("%s", _("| @name marq-y Y . . . . . . . . . . . . offset from top"));
msg_rc(_("| @name marq-position #. . . .relative position control")); msg_rc("%s", _("| @name marq-position #. . . .relative position control"));
msg_rc(_("| @name marq-color # . . . . . . . . . . font color, RGB")); msg_rc("%s", _("| @name marq-color # . . . . . . . . . . font color, RGB"));
msg_rc(_("| @name marq-opacity # . . . . . . . . . . . . . opacity")); msg_rc("%s", _("| @name marq-opacity # . . . . . . . . . . . . . opacity"));
msg_rc(_("| @name marq-timeout T. . . . . . . . . . timeout, in ms")); msg_rc("%s", _("| @name marq-timeout T. . . . . . . . . . timeout, in ms"));
msg_rc(_("| @name marq-size # . . . . . . . . font size, in pixels")); msg_rc("%s", _("| @name marq-size # . . . . . . . . font size, in pixels"));
msg_rc( "| "); msg_rc( "| ");
msg_rc(_("| @name logo-file STRING . . .the overlay file path/name")); msg_rc("%s", _("| @name logo-file STRING . . .the overlay file path/name"));
msg_rc(_("| @name logo-x X . . . . . . . . . . . .offset from left")); msg_rc("%s", _("| @name logo-x X . . . . . . . . . . . .offset from left"));
msg_rc(_("| @name logo-y Y . . . . . . . . . . . . offset from top")); msg_rc("%s", _("| @name logo-y Y . . . . . . . . . . . . offset from top"));
msg_rc(_("| @name logo-position #. . . . . . . . relative position")); msg_rc("%s", _("| @name logo-position #. . . . . . . . relative position"));
msg_rc(_("| @name logo-transparency #. . . . . . . . .transparency")); msg_rc("%s", _("| @name logo-transparency #. . . . . . . . .transparency"));
msg_rc( "| "); msg_rc( "| ");
msg_rc(_("| @name mosaic-alpha # . . . . . . . . . . . . . . alpha")); msg_rc("%s", _("| @name mosaic-alpha # . . . . . . . . . . . . . . alpha"));
msg_rc(_("| @name mosaic-height #. . . . . . . . . . . . . .height")); msg_rc("%s", _("| @name mosaic-height #. . . . . . . . . . . . . .height"));
msg_rc(_("| @name mosaic-width # . . . . . . . . . . . . . . width")); msg_rc("%s", _("| @name mosaic-width # . . . . . . . . . . . . . . width"));
msg_rc(_("| @name mosaic-xoffset # . . . .top left corner position")); msg_rc("%s", _("| @name mosaic-xoffset # . . . .top left corner position"));
msg_rc(_("| @name mosaic-yoffset # . . . .top left corner position")); msg_rc("%s", _("| @name mosaic-yoffset # . . . .top left corner position"));
msg_rc(_("| @name mosaic-offsets x,y(,x,y)*. . . . list of offsets")); msg_rc("%s", _("| @name mosaic-offsets x,y(,x,y)*. . . . list of offsets"));
msg_rc(_("| @name mosaic-align 0..2,4..6,8..10. . .mosaic alignment")); msg_rc("%s", _("| @name mosaic-align 0..2,4..6,8..10. . .mosaic alignment"));
msg_rc(_("| @name mosaic-vborder # . . . . . . . . vertical border")); msg_rc("%s", _("| @name mosaic-vborder # . . . . . . . . vertical border"));
msg_rc(_("| @name mosaic-hborder # . . . . . . . horizontal border")); msg_rc("%s", _("| @name mosaic-hborder # . . . . . . . horizontal border"));
msg_rc(_("| @name mosaic-position {0=auto,1=fixed} . . . .position")); msg_rc("%s", _("| @name mosaic-position {0=auto,1=fixed} . . . .position"));
msg_rc(_("| @name mosaic-rows #. . . . . . . . . . .number of rows")); msg_rc("%s", _("| @name mosaic-rows #. . . . . . . . . . .number of rows"));
msg_rc(_("| @name mosaic-cols #. . . . . . . . . . .number of cols")); msg_rc("%s", _("| @name mosaic-cols #. . . . . . . . . . .number of cols"));
msg_rc(_("| @name mosaic-order id(,id)* . . . . order of pictures ")); msg_rc("%s", _("| @name mosaic-order id(,id)* . . . . order of pictures "));
msg_rc(_("| @name mosaic-keep-aspect-ratio {0,1} . . .aspect ratio")); msg_rc("%s", _("| @name mosaic-keep-aspect-ratio {0,1} . . .aspect ratio"));
msg_rc( "| "); msg_rc( "| ");
} }
msg_rc(_("| help . . . . . . . . . . . . . . . this help message")); msg_rc("%s", _("| help . . . . . . . . . . . . . . . this help message"));
msg_rc(_("| longhelp . . . . . . . . . . . a longer help message")); msg_rc("%s", _("| longhelp . . . . . . . . . . . a longer help message"));
msg_rc(_("| logout . . . . . . . exit (if in socket connection)")); msg_rc("%s", _("| logout . . . . . . . exit (if in socket connection)"));
msg_rc(_("| quit . . . . . . . . . . . . . . . . . . . quit vlc")); msg_rc("%s", _("| quit . . . . . . . . . . . . . . . . . . . quit vlc"));
msg_rc( "| "); msg_rc( "| ");
msg_rc(_("+----[ end of help ]")); msg_rc("%s", _("+----[ end of help ]"));
} }
/******************************************************************** /********************************************************************
...@@ -1052,7 +1052,7 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd, ...@@ -1052,7 +1052,7 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd,
if( ( val.i_int == PAUSE_S ) && if( ( val.i_int == PAUSE_S ) &&
( strcmp( psz_cmd, "pause" ) != 0 ) ) ( strcmp( psz_cmd, "pause" ) != 0 ) )
{ {
msg_rc( _("Press menu select or pause to continue.") ); msg_rc( "%s", _("Press menu select or pause to continue.") );
vlc_object_release( p_input ); vlc_object_release( p_input );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -1302,7 +1302,7 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd, ...@@ -1302,7 +1302,7 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd,
if( val.i_int == PAUSE_S ) if( val.i_int == PAUSE_S )
{ {
msg_rc( _("Type 'menu select' or 'pause' to continue.") ); msg_rc( "%s", _("Type 'menu select' or 'pause' to continue.") );
pl_Release( p_this ); pl_Release( p_this );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -1395,7 +1395,7 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd, ...@@ -1395,7 +1395,7 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd,
int i_size = p_playlist->items.i_size / 2; int i_size = p_playlist->items.i_size / 2;
if( i_pos <= 0 ) if( i_pos <= 0 )
msg_rc( _("Error: `goto' needs an argument greater than zero.") ); msg_rc( "%s", _("Error: `goto' needs an argument greater than zero.") );
else if( i_pos <= i_size ) else if( i_pos <= i_size )
{ {
playlist_item_t *p_item, *p_parent; playlist_item_t *p_item, *p_parent;
...@@ -1546,7 +1546,7 @@ static int Volume( vlc_object_t *p_this, char const *psz_cmd, ...@@ -1546,7 +1546,7 @@ static int Volume( vlc_object_t *p_this, char const *psz_cmd,
var_Get( p_input, "state", &val ); var_Get( p_input, "state", &val );
if( val.i_int == PAUSE_S ) if( val.i_int == PAUSE_S )
{ {
msg_rc( _("Type 'menu select' or 'pause' to continue.") ); msg_rc( "%s", _("Type 'menu select' or 'pause' to continue.") );
vlc_object_release( p_input ); vlc_object_release( p_input );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -1614,7 +1614,7 @@ static int VolumeMove( vlc_object_t *p_this, char const *psz_cmd, ...@@ -1614,7 +1614,7 @@ static int VolumeMove( vlc_object_t *p_this, char const *psz_cmd,
var_Get( p_input, "state", &val ); var_Get( p_input, "state", &val );
if( val.i_int == PAUSE_S ) if( val.i_int == PAUSE_S )
{ {
msg_rc( _("Type 'menu select' or 'pause' to continue.") ); msg_rc( "%s", _("Type 'menu select' or 'pause' to continue.") );
vlc_object_release( p_input ); vlc_object_release( p_input );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -1798,7 +1798,7 @@ static int AudioConfig( vlc_object_t *p_this, char const *psz_cmd, ...@@ -1798,7 +1798,7 @@ static int AudioConfig( vlc_object_t *p_this, char const *psz_cmd,
var_Get( p_input, "state", &val ); var_Get( p_input, "state", &val );
if( val.i_int == PAUSE_S ) if( val.i_int == PAUSE_S )
{ {
msg_rc( _("Type 'menu select' or 'pause' to continue.") ); msg_rc( "%s", _("Type 'menu select' or 'pause' to continue.") );
vlc_object_release( p_input ); vlc_object_release( p_input );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -1882,7 +1882,7 @@ static int Menu( vlc_object_t *p_this, char const *psz_cmd, ...@@ -1882,7 +1882,7 @@ static int Menu( vlc_object_t *p_this, char const *psz_cmd,
if ( !*newval.psz_string ) if ( !*newval.psz_string )
{ {
msg_rc( _("Please provide one of the following parameters:") ); msg_rc( "%s", _("Please provide one of the following parameters:") );
msg_rc( "[on|off|up|down|left|right|select]" ); msg_rc( "[on|off|up|down|left|right|select]" );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -1898,7 +1898,7 @@ static int Menu( vlc_object_t *p_this, char const *psz_cmd, ...@@ -1898,7 +1898,7 @@ static int Menu( vlc_object_t *p_this, char const *psz_cmd,
if( ( val.i_int == PAUSE_S ) && if( ( val.i_int == PAUSE_S ) &&
( strcmp( newval.psz_string, "select" ) != 0 ) ) ( strcmp( newval.psz_string, "select" ) != 0 ) )
{ {
msg_rc( _("Type 'menu select' or 'pause' to continue.") ); msg_rc( "%s", _("Type 'menu select' or 'pause' to continue.") );
pl_Release( p_this ); pl_Release( p_this );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -1925,7 +1925,7 @@ static int Menu( vlc_object_t *p_this, char const *psz_cmd, ...@@ -1925,7 +1925,7 @@ static int Menu( vlc_object_t *p_this, char const *psz_cmd,
osd_MenuActivate( p_this ); osd_MenuActivate( p_this );
else else
{ {
msg_rc( _("Please provide one of the following parameters:") ); msg_rc( "%s", _("Please provide one of the following parameters:") );
msg_rc( "[on|off|up|down|left|right|select]" ); msg_rc( "[on|off|up|down|left|right|select]" );
i_error = VLC_EGENERIC; i_error = VLC_EGENERIC;
} }
...@@ -1957,7 +1957,7 @@ static int Statistics ( vlc_object_t *p_this, char const *psz_cmd, ...@@ -1957,7 +1957,7 @@ static int Statistics ( vlc_object_t *p_this, char const *psz_cmd,
*/ */
else else
{ {
msg_rc(_("Unknown command!") ); msg_rc("%s", _("Unknown command!") );
} }
vlc_object_release( p_input ); vlc_object_release( p_input );
...@@ -1973,7 +1973,7 @@ static int updateStatistics( intf_thread_t *p_intf, input_item_t *p_item ) ...@@ -1973,7 +1973,7 @@ static int updateStatistics( intf_thread_t *p_intf, input_item_t *p_item )
msg_rc( "+----[ begin of statistical info ]" ); msg_rc( "+----[ begin of statistical info ]" );
/* Input */ /* Input */
msg_rc(_("+-[Incoming]")); msg_rc("%s", _("+-[Incoming]"));
msg_rc(_("| input bytes read : %8.0f kB"), msg_rc(_("| input bytes read : %8.0f kB"),
(float)(p_item->p_stats->i_read_bytes)/1000 ); (float)(p_item->p_stats->i_read_bytes)/1000 );
msg_rc(_("| input bitrate : %6.0f kb/s"), msg_rc(_("| input bitrate : %6.0f kb/s"),
...@@ -1984,7 +1984,7 @@ static int updateStatistics( intf_thread_t *p_intf, input_item_t *p_item ) ...@@ -1984,7 +1984,7 @@ static int updateStatistics( intf_thread_t *p_intf, input_item_t *p_item )
(float)(p_item->p_stats->f_demux_bitrate)*8000 ); (float)(p_item->p_stats->f_demux_bitrate)*8000 );
msg_rc("|"); msg_rc("|");
/* Video */ /* Video */
msg_rc(_("+-[Video Decoding]")); msg_rc("%s", _("+-[Video Decoding]"));
msg_rc(_("| video decoded : %5i"), msg_rc(_("| video decoded : %5i"),
p_item->p_stats->i_decoded_video ); p_item->p_stats->i_decoded_video );
msg_rc(_("| frames displayed : %5i"), msg_rc(_("| frames displayed : %5i"),
...@@ -1993,7 +1993,7 @@ static int updateStatistics( intf_thread_t *p_intf, input_item_t *p_item ) ...@@ -1993,7 +1993,7 @@ static int updateStatistics( intf_thread_t *p_intf, input_item_t *p_item )
p_item->p_stats->i_lost_pictures ); p_item->p_stats->i_lost_pictures );
msg_rc("|"); msg_rc("|");
/* Audio*/ /* Audio*/
msg_rc(_("+-[Audio Decoding]")); msg_rc("%s", _("+-[Audio Decoding]"));
msg_rc(_("| audio decoded : %5i"), msg_rc(_("| audio decoded : %5i"),
p_item->p_stats->i_decoded_audio ); p_item->p_stats->i_decoded_audio );
msg_rc(_("| buffers played : %5i"), msg_rc(_("| buffers played : %5i"),
...@@ -2002,7 +2002,7 @@ static int updateStatistics( intf_thread_t *p_intf, input_item_t *p_item ) ...@@ -2002,7 +2002,7 @@ static int updateStatistics( intf_thread_t *p_intf, input_item_t *p_item )
p_item->p_stats->i_lost_abuffers ); p_item->p_stats->i_lost_abuffers );
msg_rc("|"); msg_rc("|");
/* Sout */ /* Sout */
msg_rc(_("+-[Streaming]")); msg_rc("%s", _("+-[Streaming]"));
msg_rc(_("| packets sent : %5i"), p_item->p_stats->i_sent_packets ); msg_rc(_("| packets sent : %5i"), p_item->p_stats->i_sent_packets );
msg_rc(_("| bytes sent : %8.0f kB"), msg_rc(_("| bytes sent : %8.0f kB"),
(float)(p_item->p_stats->i_sent_bytes)/1000 ); (float)(p_item->p_stats->i_sent_bytes)/1000 );
......
modules/demux/asf/asf.c
View file @ 946a8e91
...@@ -175,7 +175,7 @@ static int Demux( demux_t *p_demux ) ...@@ -175,7 +175,7 @@ static int Demux( demux_t *p_demux )
if( DemuxInit( p_demux ) ) if( DemuxInit( p_demux ) )
{ {
msg_Err( p_demux, "failed to load the new header" ); msg_Err( p_demux, "failed to load the new header" );
dialog_Fatal( p_demux, _("Could not demux ASF stream"), dialog_Fatal( p_demux, _("Could not demux ASF stream"), "%s",
_("VLC failed to load the ASF header.") ); _("VLC failed to load the ASF header.") );
return 0; return 0;
} }
......
modules/demux/live555.cpp
View file @ 946a8e91
...@@ -591,7 +591,7 @@ describe: ...@@ -591,7 +591,7 @@ describe:
free( psz_user ); free( psz_user );
free( psz_pwd ); free( psz_pwd );
dialog_Login( p_demux, &psz_user, &psz_pwd, dialog_Login( p_demux, &psz_user, &psz_pwd,
_("RTSP authentication"), _("RTSP authentication"), "%s",
_("Please enter a valid login name and a password.") ); _("Please enter a valid login name and a password.") );
if( psz_user != NULL && psz_pwd != NULL ) if( psz_user != NULL && psz_pwd != NULL )
{ {
......
modules/gui/skins2/commands/cmd_quit.cpp
View file @ 946a8e91
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
void CmdQuit::execute() void CmdQuit::execute()
{ {
// Stop the playlist // Stop the playlist
vout_OSDMessage( getIntf(), DEFAULT_CHAN, _( "Quit" ) ); vout_OSDMessage( getIntf(), DEFAULT_CHAN, "%s", _( "Quit" ) );
// Get the instance of OSFactory // Get the instance of OSFactory
OSFactory *pOsFactory = OSFactory::instance( getIntf() ); OSFactory *pOsFactory = OSFactory::instance( getIntf() );
......
modules/misc/audioscrobbler.c
View file @ 946a8e91
...@@ -295,7 +295,7 @@ static void Run( intf_thread_t *p_intf ) ...@@ -295,7 +295,7 @@ static void Run( intf_thread_t *p_intf )
/* username not set */ /* username not set */
dialog_Fatal( p_intf, dialog_Fatal( p_intf,
_("Last.fm username not set"), _("Last.fm username not set"),
_("Please set a username or disable the " "%s", _("Please set a username or disable the "
"audioscrobbler plugin, and restart VLC.\n" "audioscrobbler plugin, and restart VLC.\n"
"Visit http://www.last.fm/join/ to get an account.") "Visit http://www.last.fm/join/ to get an account.")
); );
...@@ -832,7 +832,7 @@ static int Handshake( intf_thread_t *p_this ) ...@@ -832,7 +832,7 @@ static int Handshake( intf_thread_t *p_this )
/* authentication failed, bad username/password combination */ /* authentication failed, bad username/password combination */
dialog_Fatal( p_this, dialog_Fatal( p_this,
_("last.fm: Authentication failed"), _("last.fm: Authentication failed"),
_("last.fm username or password is incorrect. " "%s", _("last.fm username or password is incorrect. "
"Please verify your settings and relaunch VLC." ) ); "Please verify your settings and relaunch VLC." ) );
return VLC_AUDIOSCROBBLER_EFATAL; return VLC_AUDIOSCROBBLER_EFATAL;
} }
......
modules/video_filter/crop.c
View file @ 946a8e91
...@@ -371,7 +371,7 @@ static int Init( vout_thread_t *p_vout ) ...@@ -371,7 +371,7 @@ static int Init( vout_thread_t *p_vout )
if( p_vout->p_sys->p_vout == NULL ) if( p_vout->p_sys->p_vout == NULL )
{ {
msg_Err( p_vout, "failed to create vout" ); msg_Err( p_vout, "failed to create vout" );
dialog_Fatal( p_vout, _("Cropping failed"), dialog_Fatal( p_vout, _("Cropping failed"), "%s",
_("VLC could not open the video output module.") ); _("VLC could not open the video output module.") );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -463,7 +463,7 @@ static int Manage( vout_thread_t *p_vout ) ...@@ -463,7 +463,7 @@ static int Manage( vout_thread_t *p_vout )
if( p_vout->p_sys->p_vout == NULL ) if( p_vout->p_sys->p_vout == NULL )
{ {
msg_Err( p_vout, "failed to create vout" ); msg_Err( p_vout, "failed to create vout" );
dialog_Fatal( p_vout, _("Cropping failed"), dialog_Fatal( p_vout, _("Cropping failed"), "%s",
_("VLC could not open the video output module.") ); _("VLC could not open the video output module.") );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment