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
Expand all Hide 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 )
{
msg_Err( p_access, "the DVB input old syntax is deprecated, use vlc "
"-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 " \
"explanation of the new syntax.") );
free( psz_dup );
......
modules/access/dvdnav.c
View file @ 946a8e91
......@@ -312,7 +312,7 @@ static int Open( vlc_object_t *p_this )
if( dvdnav_title_play( p_sys->dvdnav, 1 ) != DVDNAV_STATUS_OK )
{
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 "
"cannot decrypt the entire disc.") );
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 )
default:
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." ) );
p_access->info.b_eof = true;
return 0;
......
modules/audio_output/alsa.c
View file @ 946a8e91
......@@ -323,7 +323,7 @@ static int Open( vlc_object_t *p_this )
if( (psz_device = config_GetPsz( p_aout, "alsa-audio-device" )) == NULL )
{
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 " \
"enter \"default\".") );
free( p_sys );
......
modules/codec/avcodec/encoder.c
View file @ 946a8e91
......@@ -678,7 +678,7 @@ int OpenEncoder( vlc_object_t *p_this )
msg_Err( p_enc, "cannot open encoder" );
dialog_Fatal( p_enc,
_("Streaming / Transcoding failed"),
_("VLC could not open the encoder.") );
"%s", _("VLC could not open the encoder.") );
free( p_sys );
return VLC_EGENERIC;
}
......@@ -687,7 +687,7 @@ int OpenEncoder( vlc_object_t *p_this )
{
msg_Err( p_enc, "cannot open encoder" );
dialog_Fatal( p_enc, _("Streaming / Transcoding failed"),
_("VLC could not open the encoder.") );
"%s", _("VLC could not open the encoder.") );
free( p_sys );
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 )
libvlc_Quit( p_intf->p_libvlc );
ClearChannels( p_intf, p_vout );
vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Quit" ) );
vout_OSDMessage( p_intf, DEFAULT_CHAN, "%s", _( "Quit" ) );
break;
/* Volume and audio actions */
......@@ -563,7 +563,7 @@ static int PutAction( intf_thread_t *p_intf, int i_action )
{
var_SetFloat( p_vout, "scale", 1.0 );
vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
_("Zooming reset") );
"%s", _("Zooming reset") );
}
else
{
......@@ -571,10 +571,10 @@ static int PutAction( intf_thread_t *p_intf, int i_action )
var_SetBool( p_vout, "autoscale", b_autoscale );
if( b_autoscale )
vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
_("Scaled to screen") );
"%s", _("Scaled to screen") );
else
vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
_("Original Size") );
"%s", _("Original Size") );
}
}
else if( i_action == ACTIONID_SCALE_UP && p_vout )
......@@ -674,12 +674,12 @@ static int PutAction( intf_thread_t *p_intf, int i_action )
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 );
}
else if( i_action == ACTIONID_PREV )
{
vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN, "%s",
_("Previous") );
playlist_Prev( p_playlist );
}
......@@ -691,25 +691,25 @@ static int PutAction( intf_thread_t *p_intf, int i_action )
{
var_SetVoid( p_input, "frame-next" );
vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
_("Next frame") );
"%s", _("Next frame") );
}
else if( i_action == ACTIONID_FASTER )
{
var_SetVoid( p_input, "rate-faster" );
vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
_("Faster") );
"%s", _("Faster") );
}
else if( i_action == ACTIONID_SLOWER )
{
var_SetVoid( p_input, "rate-slower" );
vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
_("Slower") );
"%s", _("Slower") );
}
else if( i_action == ACTIONID_RATE_NORMAL )
{
var_SetInteger( p_input, "rate", INPUT_RATE_DEFAULT );
vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
_("1.00x") );
"%s", _("1.00x") );
}
else if( i_action == ACTIONID_RATE_FASTER_FINE ||
i_action == ACTIONID_RATE_SLOWER_FINE )
......@@ -736,7 +736,7 @@ static int PutAction( intf_thread_t *p_intf, int i_action )
char psz_msg[7+1];
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 )
{
......@@ -852,9 +852,9 @@ static int PutAction( intf_thread_t *p_intf, int i_action )
const bool b_record = !var_GetBool( p_input, "record" );
if( b_record )
vout_OSDMessage( p_intf, DEFAULT_CHAN, _("Recording") );
vout_OSDMessage( p_intf, DEFAULT_CHAN, "%s", _("Recording") );
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 );
}
}
......
modules/control/rc.c
View file @ 946a8e91
This diff is collapsed.
modules/demux/asf/asf.c
View file @ 946a8e91
......@@ -175,7 +175,7 @@ static int Demux( demux_t *p_demux )
if( DemuxInit( p_demux ) )
{
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.") );
return 0;
}
......
modules/demux/live555.cpp
View file @ 946a8e91
......@@ -591,7 +591,7 @@ describe:
free( psz_user );
free( psz_pwd );
dialog_Login( p_demux, &psz_user, &psz_pwd,
_("RTSP authentication"),
_("RTSP authentication"), "%s",
_("Please enter a valid login name and a password.") );
if( psz_user != NULL && psz_pwd != NULL )
{
......
modules/gui/skins2/commands/cmd_quit.cpp
View file @ 946a8e91
......@@ -37,7 +37,7 @@
void CmdQuit::execute()
{
// Stop the playlist
vout_OSDMessage( getIntf(), DEFAULT_CHAN, _( "Quit" ) );
vout_OSDMessage( getIntf(), DEFAULT_CHAN, "%s", _( "Quit" ) );
// Get the instance of OSFactory
OSFactory *pOsFactory = OSFactory::instance( getIntf() );
......
modules/misc/audioscrobbler.c
View file @ 946a8e91
......@@ -295,7 +295,7 @@ static void Run( intf_thread_t *p_intf )
/* username not set */
dialog_Fatal( p_intf,
_("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"
"Visit http://www.last.fm/join/ to get an account.")
);
......@@ -832,7 +832,7 @@ static int Handshake( intf_thread_t *p_this )
/* authentication failed, bad username/password combination */
dialog_Fatal( p_this,
_("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." ) );
return VLC_AUDIOSCROBBLER_EFATAL;
}
......
modules/video_filter/crop.c
View file @ 946a8e91
......@@ -371,7 +371,7 @@ static int Init( vout_thread_t *p_vout )
if( p_vout->p_sys->p_vout == NULL )
{
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.") );
return VLC_EGENERIC;
}
......@@ -463,7 +463,7 @@ static int Manage( vout_thread_t *p_vout )
if( p_vout->p_sys->p_vout == NULL )
{
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.") );
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