[vlc-commits] dsm: use sys->url for credential

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Tue Mar 15 14:05:15 2016 +0100| [250d22f256bc826a10283523b3b723d80a3afc3a] | committer: Thomas Guillem

dsm: use sys->url for credential

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

 modules/access/dsm/access.c |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/modules/access/dsm/access.c b/modules/access/dsm/access.c
index 6c2d6c8..cdff451 100644
--- a/modules/access/dsm/access.c
+++ b/modules/access/dsm/access.c
@@ -142,7 +142,7 @@ static int Open( vlc_object_t *p_this )
     if( p_sys->p_session == NULL )
         goto error;
 
-    vlc_UrlParse( &p_sys->url, p_access->psz_location );
+    vlc_UrlParse( &p_sys->url, p_access->psz_url );
     if( get_address( p_access ) != VLC_SUCCESS )
         goto error;
 
@@ -314,14 +314,12 @@ static int login( access_t *p_access )
 {
     int i_ret = VLC_EGENERIC;
     access_sys_t *p_sys = p_access->p_sys;
-    vlc_url_t url;
     vlc_credential credential;
     char *psz_var_domain;
     const char *psz_login, *psz_password, *psz_domain;
     bool b_guest = false;
 
-    vlc_UrlParse( &url, p_access->psz_url );
-    vlc_credential_init( &credential, &url );
+    vlc_credential_init( &credential, &p_sys->url );
     psz_var_domain = var_InheritString( p_access, "smb-domain" );
     credential.psz_realm = psz_var_domain ? psz_var_domain : NULL;
 
@@ -379,7 +377,6 @@ success:
     i_ret = VLC_SUCCESS;
 error:
     vlc_credential_clean( &credential );
-    vlc_UrlClean( &url );
     free( psz_var_domain );
     return i_ret;
 }