Skip to content

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

Sync with module macros and sout chain parsing

parent 11d2650a
Show whitespace changes
Inline Side-by-side
Showing with 17 additions and 25 deletions
src/modules/configuration.c
View file @ 8b554082
...@@ -1556,24 +1556,20 @@ int __config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc, char *ppsz_argv[], ...@@ -1556,24 +1556,20 @@ int __config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc, char *ppsz_argv[],
/* Check if the option is deprecated */ /* Check if the option is deprecated */
if( p_conf->psz_current ) if( p_conf->psz_current )
{ {
if( !strcmp(p_conf->psz_current,"SUPPRESSED") ) if( p_conf->b_strict )
{
if( !b_ignore_errors )
{ {
fprintf(stderr, fprintf(stderr,
"Warning: option --%s is no longer used.\n", "Warning: option --%s no longer exists.\n",
p_conf->psz_name); p_conf->psz_name);
}
continue; continue;
} }
if( !b_ignore_errors )
{
if( p_conf->b_strict )
{
fprintf( stderr, fprintf( stderr,
"Error: option --%s is deprecated. " "%s: option --%s is deprecated. Use --%s instead.\n",
"Use --%s instead.\n", b_ignore_errors ? "Warning" : "Error",
p_conf->psz_name, p_conf->psz_current); p_conf->psz_name, p_conf->psz_current);
if( !b_ignore_errors )
{
/*free */ /*free */
for( i_index = 0; p_longopts[i_index].name; i_index++ ) for( i_index = 0; p_longopts[i_index].name; i_index++ )
free( (char *)p_longopts[i_index].name ); free( (char *)p_longopts[i_index].name );
...@@ -1582,11 +1578,7 @@ int __config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc, char *ppsz_argv[], ...@@ -1582,11 +1578,7 @@ int __config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc, char *ppsz_argv[],
free( psz_shortopts ); free( psz_shortopts );
return -1; return -1;
} }
fprintf(stderr,
"Warning: option --%s is deprecated. "
"You should use --%s instead.\n",
p_conf->psz_name, p_conf->psz_current);
}
psz_name = (char *)p_conf->psz_current; psz_name = (char *)p_conf->psz_current;
p_conf = config_FindConfig( p_this, psz_name ); p_conf = config_FindConfig( p_this, psz_name );
} }
......
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