[vlc-commits] commit: Compile fix (Christophe Mutricy )

[git at videolan.org]

vlc | branch: master | Christophe Mutricy <xtophe at videolan.org> | Mon May 10 23:02:17 2010 +0100| [9b334071ef9b1c098f4bcddaa4e06504fe9be3f6] | committer: Christophe Mutricy 

Compile fix

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9b334071ef9b1c098f4bcddaa4e06504fe9be3f6
---

 modules/access/rtsp/access.c |    2 +-
 modules/access/smb.c         |   20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/modules/access/rtsp/access.c b/modules/access/rtsp/access.c
index c5dcc14..e0bef73 100644
--- a/modules/access/rtsp/access.c
+++ b/modules/access/rtsp/access.c
@@ -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 );
     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 );
         p_sys->p_rtsp = NULL;
         goto error;
diff --git a/modules/access/smb.c b/modules/access/smb.c
index f35a880..c44394c 100644
--- a/modules/access/smb.c
+++ b/modules/access/smb.c
@@ -131,15 +131,15 @@ static int Open( vlc_object_t *p_this )
     access_t     *p_access = (access_t*)p_this;
     access_sys_t *p_sys;
     struct stat  filestat;
-    char         *psz_path, *psz_uri;
+    char         *psz_location, *psz_uri;
     char         *psz_user = NULL, *psz_pwd = NULL, *psz_domain = NULL;
     int          i_ret;
     int          i_smb;
 
     /* Parse input URI
      * [[[domain;]user[:password@]]server[/share[/path[/file]]]] */
-    psz_path = strchr( p_access->psz_location, '/' );
-    if( !psz_path )
+    psz_location = strchr( p_access->psz_location, '/' );
+    if( !psz_location )
     {
         msg_Err( p_access, "invalid SMB URI: smb://%s", psz_location );
         return VLC_EGENERIC;
@@ -149,14 +149,14 @@ static int Open( vlc_object_t *p_this )
         char *psz_tmp = strdup( p_access->psz_location );
         char *psz_parser;
 
-        psz_tmp[ psz_path - p_access->psz_location ] = 0;
-        psz_path = p_access->psz_location;
+        psz_tmp[ psz_location - p_access->psz_location ] = 0;
+        psz_location = p_access->psz_location;
         psz_parser = strchr( psz_tmp, '@' );
         if( psz_parser )
         {
             /* User info is there */
             *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, ':' );
             if( psz_parser )
@@ -193,16 +193,16 @@ static int Open( vlc_object_t *p_this )
 
 #ifdef WIN32
     if( psz_user )
-        Win32AddConnection( p_access, psz_path, psz_user, psz_pwd, psz_domain);
-    i_ret = asprintf( &psz_uri, "//%s", psz_path );
+        Win32AddConnection( p_access, psz_location, psz_user, psz_pwd, psz_domain);
+    i_ret = asprintf( &psz_uri, "//%s", psz_location );
 #else
     if( psz_user )
         i_ret = asprintf( &psz_uri, "smb://%s%s%s%s%s@%s",
                           psz_domain ? psz_domain : "", psz_domain ? ";" : "",
                           psz_user, psz_pwd ? ":" : "",
-                          psz_pwd ? psz_pwd : "", psz_path );
+                          psz_pwd ? psz_pwd : "", psz_location );
     else
-        i_ret = asprintf( &psz_uri, "smb://%s", psz_path );
+        i_ret = asprintf( &psz_uri, "smb://%s", psz_location );
 #endif
 
     free( psz_user );