Commit 6a0c1f90 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

system_Configure: remove unused indirection

This is too late to change command line options anyway.
parent ef1962f8
......@@ -818,7 +818,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
}
/* System specific configuration */
system_Configure( p_libvlc, &i_argc, ppsz_argv );
system_Configure( p_libvlc, i_argc, ppsz_argv );
/* Add service discovery modules */
psz_modules = var_InheritString( p_libvlc, "services-discovery" );
......
......@@ -42,7 +42,7 @@ extern void vlc_DeinitActions (libvlc_int_t *);
* OS-specific initialization
*/
void system_Init ( libvlc_int_t *, int *, const char *[] );
void system_Configure ( libvlc_int_t *, int *, const char *[] );
void system_Configure ( libvlc_int_t *, int, const char *const [] );
void system_End ( libvlc_int_t * );
/*
......
......@@ -162,10 +162,11 @@ void system_Init( libvlc_int_t *p_this, int *pi_argc, const char *ppsz_argv[] )
/*****************************************************************************
* system_Configure: check for system specific configuration options.
*****************************************************************************/
void system_Configure( libvlc_int_t *p_this, int *pi_argc, const char *ppsz_argv[] )
void system_Configure( libvlc_int_t *p_this,
int i_argc, const char *const ppsz_argv[] )
{
(void)p_this;
(void)pi_argc;
(void)i_argc;
(void)ppsz_argv;
}
......
......@@ -115,7 +115,8 @@ void system_Init (libvlc_int_t *libvlc, int *argc, const char *argv[])
(void)libvlc; (void)argc; (void)argv;
}
void system_Configure (libvlc_int_t *libvlc, int *argc, const char *argv[])
void system_Configure (libvlc_int_t *libvlc,
int argc, const char *const argv[])
{
(void)libvlc; (void)argc; (void)argv;
}
......
......@@ -39,7 +39,8 @@ void system_Init (libvlc_int_t *libvlc, int *argc, const char *argv[])
(void)libvlc; (void)argc; (void)argv;
}
void system_Configure (libvlc_int_t *libvlc, int *argc, const char *argv[])
void system_Configure (libvlc_int_t *libvlc,
int argc, const char *const argv[])
{
(void)libvlc; (void)argc; (void)argv;
}
......
......@@ -134,7 +134,7 @@ typedef struct
char data[];
} vlc_ipc_data_t;
void system_Configure( libvlc_int_t *p_this, int *pi_argc, const char *ppsz_argv[] )
void system_Configure( libvlc_int_t *p_this, int i_argc, const char *const ppsz_argv[] )
{
#if !defined( UNDER_CE )
/* Raise default priority of the current process */
......@@ -221,24 +221,24 @@ void system_Configure( libvlc_int_t *p_this, int *pi_argc, const char *ppsz_argv
/* We assume that the remaining parameters are filenames
* and their input options */
if( *pi_argc - 1 >= vlc_optind )
if( i_argc - 1 >= vlc_optind )
{
COPYDATASTRUCT wm_data;
int i_opt;
vlc_ipc_data_t *p_data;
size_t i_data = sizeof (*p_data);
for( i_opt = vlc_optind; i_opt < *pi_argc; i_opt++ )
for( i_opt = vlc_optind; i_opt < i_argc; i_opt++ )
{
i_data += sizeof (size_t);
i_data += strlen( ppsz_argv[ i_opt ] ) + 1;
}
p_data = malloc( i_data );
p_data->argc = *pi_argc - vlc_optind;
p_data->argc = i_argc - vlc_optind;
p_data->enqueue = var_InheritBool( p_this, "playlist-enqueue" );
i_data = 0;
for( i_opt = vlc_optind; i_opt < *pi_argc; i_opt++ )
for( i_opt = vlc_optind; i_opt < i_argc; i_opt++ )
{
size_t i_len = strlen( ppsz_argv[ i_opt ] ) + 1;
/* Windows will never switch to an architecture
......
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