mirror of
https://code.videolan.org/videolan/vlc
synced 2024-10-03 01:31:53 +02:00
Fix format-security warnings
Trimmed and Signed-off-by: Rémi Denis-Courmont <rdenis@simphalempin.com>
This commit is contained in:
parent
2d50850e3e
commit
25c5812608
@ -1069,7 +1069,7 @@ static void DisplayPosition( intf_thread_t *p_intf, vout_thread_t *p_vout,
|
||||
}
|
||||
else if( i_seconds > 0 )
|
||||
{
|
||||
vout_OSDMessage( p_input, POSITION_TEXT_CHAN, psz_time );
|
||||
vout_OSDMessage( p_input, POSITION_TEXT_CHAN, "%s", psz_time );
|
||||
}
|
||||
|
||||
if( p_vout->b_fullscreen )
|
||||
|
@ -634,7 +634,7 @@ static void Run( intf_thread_t *p_intf )
|
||||
|
||||
if( psz_msg )
|
||||
{
|
||||
msg_rc( psz_msg );
|
||||
msg_rc( "%s", psz_msg );
|
||||
free( psz_msg );
|
||||
}
|
||||
}
|
||||
|
@ -456,7 +456,7 @@ static void Run( intf_thread_t *p_intf )
|
||||
if( psz_msg )
|
||||
{
|
||||
vlm_message_t *message;
|
||||
message = vlm_MessageNew( "Module command", psz_msg );
|
||||
message = vlm_MessageNew( "Module command", "%s", psz_msg );
|
||||
Write_message( cl, message, NULL, WRITE_MODE_CMD );
|
||||
vlm_MessageDelete( message );
|
||||
free( psz_msg );
|
||||
|
@ -85,7 +85,7 @@ static int vlclua_osd_message( lua_State *L )
|
||||
const char *psz_message = luaL_checkstring( L, 1 );
|
||||
int i_chan = luaL_optint( L, 2, DEFAULT_CHAN );
|
||||
vlc_object_t *p_this = vlclua_get_this( L );
|
||||
vout_OSDMessage( p_this, i_chan, psz_message );
|
||||
vout_OSDMessage( p_this, i_chan, "%s", psz_message );
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -317,7 +317,7 @@ void __vlclua_read_custom_meta_data( vlc_object_t *p_this, lua_State *L,
|
||||
psz_meta_category, psz_meta_name,
|
||||
psz_meta_value );
|
||||
input_item_AddInfo( p_input, psz_meta_category,
|
||||
psz_meta_name, psz_meta_value );
|
||||
psz_meta_name, "%s", psz_meta_value );
|
||||
}
|
||||
lua_pop( L, 1 ); /* pop item */
|
||||
/* ... item meta key value key2 */
|
||||
|
@ -533,7 +533,7 @@ static int ExecuteExport( vlm_t *p_vlm, vlm_message_t **pp_status )
|
||||
{
|
||||
char *psz_export = Save( p_vlm );
|
||||
|
||||
*pp_status = vlm_MessageNew( "export", psz_export );
|
||||
*pp_status = vlm_MessageNew( "export", "%s", psz_export );
|
||||
free( psz_export );
|
||||
return VLC_SUCCESS;
|
||||
}
|
||||
@ -909,7 +909,7 @@ int ExecuteCommand( vlm_t *p_vlm, const char *psz_command,
|
||||
|
||||
if( psz_temp == NULL )
|
||||
{
|
||||
p_message = vlm_MessageNew( "Incomplete command", psz_command );
|
||||
p_message = vlm_MessageNew( "Incomplete command", "%s", psz_command );
|
||||
goto error;
|
||||
}
|
||||
|
||||
@ -1304,7 +1304,7 @@ static vlm_message_t *vlm_ShowMedia( vlm_media_sys_t *p_media )
|
||||
|
||||
if( p_cfg->b_vod )
|
||||
vlm_MessageAdd( p_msg,
|
||||
vlm_MessageNew( "mux", p_cfg->vod.psz_mux ) );
|
||||
vlm_MessageNew( "mux", "%s", p_cfg->vod.psz_mux ) );
|
||||
else
|
||||
vlm_MessageAdd( p_msg,
|
||||
vlm_MessageNew( "loop", p_cfg->broadcast.b_loop ? "yes" : "no" ) );
|
||||
@ -1316,13 +1316,13 @@ static vlm_message_t *vlm_ShowMedia( vlm_media_sys_t *p_media )
|
||||
if( asprintf( &psz_tmp, "%d", i+1 ) != -1 )
|
||||
{
|
||||
vlm_MessageAdd( p_msg_sub,
|
||||
vlm_MessageNew( psz_tmp, p_cfg->ppsz_input[i] ) );
|
||||
vlm_MessageNew( psz_tmp, "%s", p_cfg->ppsz_input[i] ) );
|
||||
free( psz_tmp );
|
||||
}
|
||||
}
|
||||
|
||||
vlm_MessageAdd( p_msg,
|
||||
vlm_MessageNew( "output", p_cfg->psz_output ? p_cfg->psz_output : "" ) );
|
||||
vlm_MessageNew( "output", "%s", p_cfg->psz_output ? p_cfg->psz_output : "" ) );
|
||||
|
||||
p_msg_sub = vlm_MessageAdd( p_msg, vlm_MessageNew( "options", vlm_NULL ) );
|
||||
for( i = 0; i < p_cfg->i_option; i++ )
|
||||
@ -1343,7 +1343,7 @@ static vlm_message_t *vlm_ShowMedia( vlm_media_sys_t *p_media )
|
||||
p_msg_instance = vlm_MessageAdd( p_msg_sub, vlm_MessageNew( "instance" , vlm_NULL ) );
|
||||
|
||||
vlm_MessageAdd( p_msg_instance,
|
||||
vlm_MessageNew( "name" , p_instance->psz_name ? p_instance->psz_name : "default" ) );
|
||||
vlm_MessageNew( "name" , "%s", p_instance->psz_name ? p_instance->psz_name : "default" ) );
|
||||
vlm_MessageAdd( p_msg_instance,
|
||||
vlm_MessageNew( "state",
|
||||
val.i_int == PLAYING_S ? "playing" :
|
||||
@ -1358,7 +1358,7 @@ static vlm_message_t *vlm_ShowMedia( vlm_media_sys_t *p_media )
|
||||
var_Get ## type( p_instance->p_input, a ) ) != -1 ) \
|
||||
{ \
|
||||
vlm_MessageAdd( p_msg_instance, vlm_MessageNew( a, \
|
||||
psz_tmp ) ); \
|
||||
"%s", psz_tmp ) ); \
|
||||
free( psz_tmp ); \
|
||||
}
|
||||
APPEND_INPUT_INFO( "position", "%f", Float );
|
||||
@ -1373,7 +1373,7 @@ static vlm_message_t *vlm_ShowMedia( vlm_media_sys_t *p_media )
|
||||
if( asprintf( &psz_tmp, "%d", p_instance->i_index + 1 ) != -1 )
|
||||
{
|
||||
vlm_MessageAdd( p_msg_instance, vlm_MessageNew( "playlistindex",
|
||||
psz_tmp ) );
|
||||
"%s", psz_tmp ) );
|
||||
free( psz_tmp );
|
||||
}
|
||||
}
|
||||
@ -1422,7 +1422,7 @@ static vlm_message_t *vlm_Show( vlm_t *vlm, vlm_media_sys_t *media,
|
||||
date.tm_hour, date.tm_min, date.tm_sec ) != -1 )
|
||||
{
|
||||
vlm_MessageAdd( msg_schedule,
|
||||
vlm_MessageNew( "date", psz_date ) );
|
||||
vlm_MessageNew( "date", "%s", psz_date ) );
|
||||
free( psz_date );
|
||||
}
|
||||
}
|
||||
@ -1450,13 +1450,13 @@ static vlm_message_t *vlm_Show( vlm_t *vlm, vlm_media_sys_t *media,
|
||||
sprintf( buffer, "%d/%d/%d-%d:%d:%d", date.tm_year, date.tm_mon,
|
||||
date.tm_mday, date.tm_hour, date.tm_min, date.tm_sec);
|
||||
|
||||
vlm_MessageAdd( msg_schedule, vlm_MessageNew("period", buffer) );
|
||||
vlm_MessageAdd( msg_schedule, vlm_MessageNew("period", "%s", buffer) );
|
||||
}
|
||||
else
|
||||
vlm_MessageAdd( msg_schedule, vlm_MessageNew("period", "0") );
|
||||
|
||||
sprintf( buffer, "%d", schedule->i_repeat );
|
||||
vlm_MessageAdd( msg_schedule, vlm_MessageNew( "repeat", buffer ) );
|
||||
vlm_MessageAdd( msg_schedule, vlm_MessageNew( "repeat", "%s", buffer ) );
|
||||
|
||||
msg_child =
|
||||
vlm_MessageAdd( msg_schedule, vlm_MessageNew("commands", vlm_NULL ) );
|
||||
@ -1491,7 +1491,8 @@ static vlm_message_t *vlm_Show( vlm_t *vlm, vlm_media_sys_t *media,
|
||||
i_vod) == -1 )
|
||||
return NULL;
|
||||
p_msg = vlm_MessageNew( "show", vlm_NULL );
|
||||
p_msg_child = vlm_MessageAdd( p_msg, vlm_MessageNew( "media", psz_count ) );
|
||||
p_msg_child = vlm_MessageAdd( p_msg, vlm_MessageNew( "media", "%s",
|
||||
psz_count ) );
|
||||
free( psz_count );
|
||||
|
||||
for( i = 0; i < vlm->i_media; i++ )
|
||||
@ -1550,7 +1551,7 @@ static vlm_message_t *vlm_Show( vlm_t *vlm, vlm_media_sys_t *media,
|
||||
#endif
|
||||
|
||||
vlm_MessageAdd( msg_schedule,
|
||||
vlm_MessageNew( "next launch", psz_date ) );
|
||||
vlm_MessageNew( "next launch", "%s", psz_date ) );
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user