Commit 8b554082 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Sync with module macros and sout chain parsing

parent 11d2650a
...@@ -1556,37 +1556,29 @@ int __config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc, char *ppsz_argv[], ...@@ -1556,37 +1556,29 @@ 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,
{ "Warning: option --%s no longer exists.\n",
fprintf(stderr, p_conf->psz_name);
"Warning: option --%s is no longer used.\n",
p_conf->psz_name);
}
continue; continue;
} }
fprintf( stderr,
"%s: option --%s is deprecated. Use --%s instead.\n",
b_ignore_errors ? "Warning" : "Error",
p_conf->psz_name, p_conf->psz_current);
if( !b_ignore_errors ) if( !b_ignore_errors )
{ {
if( p_conf->b_strict ) /*free */
{ for( i_index = 0; p_longopts[i_index].name; i_index++ )
fprintf( stderr, free( (char *)p_longopts[i_index].name );
"Error: option --%s is deprecated. "
"Use --%s instead.\n", free( p_longopts );
p_conf->psz_name, p_conf->psz_current); free( psz_shortopts );
/*free */ return -1;
for( i_index = 0; p_longopts[i_index].name; i_index++ )
free( (char *)p_longopts[i_index].name );
free( p_longopts );
free( psz_shortopts );
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