Commit 5960c93c authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove useless indirection

parent f4889b14
......@@ -47,7 +47,7 @@
* options used (ie. exported) by each module.
*
* @param p_this object to write command line options as variables to
* @param pi_argc number of command line arguments [IN/OUT]
* @param i_argc number of command line arguments
* @param ppsz_args commandl ine arguments [IN/OUT]
* @param b_ignore_errors whether to ignore parsing errors
* @return 0 on success, -1 on error.
......@@ -55,7 +55,7 @@
* @warning This function is not re-entrant (because of getopt_long()).
* It must be called with the module bank initialization global lock held.
*/
int config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc,
int config_LoadCmdLine( vlc_object_t *p_this, int i_argc,
const char *ppsz_argv[], bool b_ignore_errors )
{
int i_cmd, i_index, i_opts, i_shortopts, flag, i_verbose = 0;
......@@ -101,7 +101,7 @@ int config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc,
* us, ignoring the arity of the options */
if( b_ignore_errors )
{
argv_copy = (const char**)malloc( *pi_argc * sizeof(char *) );
argv_copy = (const char**)malloc( i_argc * sizeof(char *) );
if( argv_copy == NULL )
{
free( psz_shortopts );
......@@ -109,7 +109,7 @@ int config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc,
module_list_free (list);
return -1;
}
memcpy( argv_copy, ppsz_argv, *pi_argc * sizeof(char *) );
memcpy( argv_copy, ppsz_argv, i_argc * sizeof(char *) );
ppsz_argv = argv_copy;
}
......@@ -199,7 +199,7 @@ int config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc,
* Parse the command line options
*/
vlc_optind = 0; /* set to 0 to tell GNU getopt to reinitialize */
while( ( i_cmd = vlc_getopt_long( *pi_argc, (char **)ppsz_argv,
while( ( i_cmd = vlc_getopt_long( i_argc, (char **)ppsz_argv,
psz_shortopts,
p_longopts, &i_index ) ) != -1 )
{
......
......@@ -36,7 +36,7 @@ int config_AutoSaveConfigFile( vlc_object_t * );
void config_Free( module_t * );
int config_LoadCmdLine ( vlc_object_t *, int *, const char *[], bool );
int config_LoadCmdLine ( vlc_object_t *, int, const char *[], bool );
int config_LoadConfigFile( vlc_object_t *, const char * );
#define config_LoadCmdLine(a,b,c,d) config_LoadCmdLine(VLC_OBJECT(a),b,c,d)
#define config_LoadConfigFile(a,b) config_LoadConfigFile(VLC_OBJECT(a),b)
......
......@@ -321,7 +321,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
* options) */
module_InitBank( p_libvlc );
if( config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, true ) )
if( config_LoadCmdLine( p_libvlc, i_argc, ppsz_argv, true ) )
{
module_EndBank( p_libvlc, false );
return VLC_EGENERIC;
......@@ -537,7 +537,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
/* config_LoadCmdLine(), DBus (below) and Win32-specific use vlc_optind,
* vlc_optarg and vlc_optopt globals. This is not thread-safe!! */
#warning BUG!
if( config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, false ) )
if( config_LoadCmdLine( p_libvlc, i_argc, ppsz_argv, false ) )
{
#ifdef WIN32
ShowConsole( false );
......
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