Skip to content

V
vlc-2-2
Commit 0e4feb1e authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Handle -v correctly (i.e. as most other programs do)

parent 4ac9513c
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 27 deletions
src/config/cmdline.c
View file @ 0e4feb1e
...@@ -178,16 +178,11 @@ int config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc, ...@@ -178,16 +178,11 @@ int config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc,
pp_shortopts[(int)p_item->i_short] = p_item; pp_shortopts[(int)p_item->i_short] = p_item;
psz_shortopts[i_shortopts] = p_item->i_short; psz_shortopts[i_shortopts] = p_item->i_short;
i_shortopts++; i_shortopts++;
if( p_item->i_type != CONFIG_ITEM_BOOL ) if( p_item->i_type != CONFIG_ITEM_BOOL
&& p_item->i_short != 'v' )
{ {
psz_shortopts[i_shortopts] = ':'; psz_shortopts[i_shortopts] = ':';
i_shortopts++; i_shortopts++;
if( p_item->i_short == 'v' )
{
psz_shortopts[i_shortopts] = ':';
i_shortopts++;
}
} }
} }
} }
...@@ -308,26 +303,7 @@ int config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc, ...@@ -308,26 +303,7 @@ int config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc,
var_Create( p_this, name, VLC_VAR_INTEGER ); var_Create( p_this, name, VLC_VAR_INTEGER );
if( i_cmd == 'v' ) if( i_cmd == 'v' )
{ {
if( vlc_optarg ) i_verbose++; /* -v */
{
if( *vlc_optarg == 'v' ) /* eg. -vvv */
{
i_verbose++;
while( *vlc_optarg == 'v' )
{
i_verbose++;
vlc_optarg++;
}
}
else
{
i_verbose += atoi( vlc_optarg ); /* eg. -v2 */
}
}
else
{
i_verbose++; /* -v */
}
var_SetInteger( p_this, name, i_verbose ); var_SetInteger( p_this, name, i_verbose );
} }
else else
......
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