diff --git a/src/libvlc.c b/src/libvlc.c index 6097529d06..c53d6be958 100644 --- a/src/libvlc.c +++ b/src/libvlc.c @@ -268,7 +268,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, #endif /* System specific initialization code */ - system_Init( p_libvlc, &i_argc, ppsz_argv ); + system_Init(); /* * Support for gettext diff --git a/src/libvlc.h b/src/libvlc.h index 99fc643f4f..c702cc04a8 100644 --- a/src/libvlc.h +++ b/src/libvlc.h @@ -37,7 +37,7 @@ size_t vlc_towc (const char *str, uint32_t *restrict pwc); /* * OS-specific initialization */ -void system_Init ( libvlc_int_t *, int *, const char *[] ); +void system_Init ( void ); void system_Configure ( libvlc_int_t *, int, const char *const [] ); void system_End ( libvlc_int_t * ); diff --git a/src/posix/darwin_specific.c b/src/posix/darwin_specific.c index 810bd1b27a..9dead944ac 100644 --- a/src/posix/darwin_specific.c +++ b/src/posix/darwin_specific.c @@ -47,14 +47,12 @@ /***************************************************************************** * system_Init: fill in program path & retrieve language *****************************************************************************/ -void system_Init( libvlc_int_t *p_this, int *pi_argc, const char *ppsz_argv[] ) +void system_Init(void) { - VLC_UNUSED(p_this); char i_dummy; char *p_char = NULL; char *p_oldchar = &i_dummy; unsigned int i; - (void)pi_argc; /* Get the full program path and name */ /* First try to see if we are linked to the framework */ @@ -107,11 +105,6 @@ void system_Init( libvlc_int_t *p_this, int *pi_argc, const char *ppsz_argv[] ) if ( !_NSGetExecutablePath(path, &path_len) ) p_char = strdup(path); } - if( !p_char ) - { - /* We are not linked to the VLC.framework, return the executable path */ - p_char = strdup( ppsz_argv[ 0 ] ); - } free(psz_vlcpath); psz_vlcpath = p_char; diff --git a/src/posix/linux_specific.c b/src/posix/linux_specific.c index 1644ce6213..11dd6d66c0 100644 --- a/src/posix/linux_specific.c +++ b/src/posix/linux_specific.c @@ -88,7 +88,7 @@ static struct # include #endif -void system_Init (libvlc_int_t *libvlc, int *argc, const char *argv[]) +void system_Init (void) { #ifdef __GLIBC__ const char *glcv = gnu_get_libc_version (); @@ -111,8 +111,6 @@ void system_Init (libvlc_int_t *libvlc, int *argc, const char *argv[]) if (once.refs++ == 0) set_libvlc_path (); vlc_mutex_unlock (&once.lock); - - (void)libvlc; (void)argc; (void)argv; } void system_Configure (libvlc_int_t *libvlc, diff --git a/src/posix/specific.c b/src/posix/specific.c index df917c1ef3..cd53a96e7f 100644 --- a/src/posix/specific.c +++ b/src/posix/specific.c @@ -31,12 +31,11 @@ static void set_libvlc_path (void) psz_vlcpath = (char *)PKGLIBDIR; } -void system_Init (libvlc_int_t *libvlc, int *argc, const char *argv[]) +void system_Init (void) { pthread_once_t once = PTHREAD_ONCE_INIT; pthread_once (&once, set_libvlc_path); - (void)libvlc; (void)argc; (void)argv; } void system_Configure (libvlc_int_t *libvlc, diff --git a/src/win32/specific.c b/src/win32/specific.c index 7a47e82453..3a4d0a1592 100644 --- a/src/win32/specific.c +++ b/src/win32/specific.c @@ -44,9 +44,8 @@ /***************************************************************************** * system_Init: initialize winsock and misc other things. *****************************************************************************/ -void system_Init( libvlc_int_t *p_this, int *pi_argc, const char *ppsz_argv[] ) +void system_Init( void ) { - VLC_UNUSED( p_this ); VLC_UNUSED( pi_argc ); VLC_UNUSED( ppsz_argv ); WSADATA Data; MEMORY_BASIC_INFORMATION mbi;