Commit 9b334071 authored by Christophe Mutricy's avatar Christophe Mutricy

Compile fix

parent f22a1f3f
...@@ -196,7 +196,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -196,7 +196,7 @@ static int Open( vlc_object_t *p_this )
i_result = rtsp_connect( p_sys->p_rtsp, p_access->psz_location, 0 ); i_result = rtsp_connect( p_sys->p_rtsp, p_access->psz_location, 0 );
if( i_result ) if( i_result )
{ {
msg_Dbg( p_access, "could not connect to: %s", p_access->psz_path ); msg_Dbg( p_access, "could not connect to: %s", p_access->psz_location );
free( p_sys->p_rtsp ); free( p_sys->p_rtsp );
p_sys->p_rtsp = NULL; p_sys->p_rtsp = NULL;
goto error; goto error;
......
...@@ -131,15 +131,15 @@ static int Open( vlc_object_t *p_this ) ...@@ -131,15 +131,15 @@ static int Open( vlc_object_t *p_this )
access_t *p_access = (access_t*)p_this; access_t *p_access = (access_t*)p_this;
access_sys_t *p_sys; access_sys_t *p_sys;
struct stat filestat; struct stat filestat;
char *psz_path, *psz_uri; char *psz_location, *psz_uri;
char *psz_user = NULL, *psz_pwd = NULL, *psz_domain = NULL; char *psz_user = NULL, *psz_pwd = NULL, *psz_domain = NULL;
int i_ret; int i_ret;
int i_smb; int i_smb;
/* Parse input URI /* Parse input URI
* [[[domain;]user[:password@]]server[/share[/path[/file]]]] */ * [[[domain;]user[:password@]]server[/share[/path[/file]]]] */
psz_path = strchr( p_access->psz_location, '/' ); psz_location = strchr( p_access->psz_location, '/' );
if( !psz_path ) if( !psz_location )
{ {
msg_Err( p_access, "invalid SMB URI: smb://%s", psz_location ); msg_Err( p_access, "invalid SMB URI: smb://%s", psz_location );
return VLC_EGENERIC; return VLC_EGENERIC;
...@@ -149,14 +149,14 @@ static int Open( vlc_object_t *p_this ) ...@@ -149,14 +149,14 @@ static int Open( vlc_object_t *p_this )
char *psz_tmp = strdup( p_access->psz_location ); char *psz_tmp = strdup( p_access->psz_location );
char *psz_parser; char *psz_parser;
psz_tmp[ psz_path - p_access->psz_location ] = 0; psz_tmp[ psz_location - p_access->psz_location ] = 0;
psz_path = p_access->psz_location; psz_location = p_access->psz_location;
psz_parser = strchr( psz_tmp, '@' ); psz_parser = strchr( psz_tmp, '@' );
if( psz_parser ) if( psz_parser )
{ {
/* User info is there */ /* User info is there */
*psz_parser = 0; *psz_parser = 0;
psz_path = p_access->psz_location + (psz_parser - psz_tmp) + 1; psz_location = p_access->psz_location + (psz_parser - psz_tmp) + 1;
psz_parser = strchr( psz_tmp, ':' ); psz_parser = strchr( psz_tmp, ':' );
if( psz_parser ) if( psz_parser )
...@@ -193,16 +193,16 @@ static int Open( vlc_object_t *p_this ) ...@@ -193,16 +193,16 @@ static int Open( vlc_object_t *p_this )
#ifdef WIN32 #ifdef WIN32
if( psz_user ) if( psz_user )
Win32AddConnection( p_access, psz_path, psz_user, psz_pwd, psz_domain); Win32AddConnection( p_access, psz_location, psz_user, psz_pwd, psz_domain);
i_ret = asprintf( &psz_uri, "//%s", psz_path ); i_ret = asprintf( &psz_uri, "//%s", psz_location );
#else #else
if( psz_user ) if( psz_user )
i_ret = asprintf( &psz_uri, "smb://%s%s%s%s%s@%s", i_ret = asprintf( &psz_uri, "smb://%s%s%s%s%s@%s",
psz_domain ? psz_domain : "", psz_domain ? ";" : "", psz_domain ? psz_domain : "", psz_domain ? ";" : "",
psz_user, psz_pwd ? ":" : "", psz_user, psz_pwd ? ":" : "",
psz_pwd ? psz_pwd : "", psz_path ); psz_pwd ? psz_pwd : "", psz_location );
else else
i_ret = asprintf( &psz_uri, "smb://%s", psz_path ); i_ret = asprintf( &psz_uri, "smb://%s", psz_location );
#endif #endif
free( psz_user ); free( psz_user );
......
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