When using contribs, don't set --with-a52-tree or --with-libmpeg2-tree

[vlc] / modules / access / smb.c

diff --git a/modules/access/smb.c b/modules/access/smb.c
index 83fcd0739a444317eea3275d637ccdea7065fc1d..3f21b6be03afa42b1d92498166db4d5680e2d52b 100644 (file)
--- a/modules/access/smb.c
+++ b/modules/access/smb.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_access.h>
 
@@ -112,13 +112,13 @@ struct access_sys_t
 
 #ifdef WIN32
 static void Win32AddConnection( access_t *, char *, char *, char *, char * );
-#endif
-
+#else
 static void smb_auth( const char *srv, const char *shr, char *wg, int wglen,
                       char *un, int unlen, char *pw, int pwlen )
 {
     //wglen = unlen = pwlen = 0;
 }
+#endif
 
 /****************************************************************************
  * Open: connect to smb server and ask for file
@@ -189,11 +189,11 @@ static int Open( vlc_object_t *p_this )
      * smb://[[[domain;]user[:password@]]server[/share[/path[/file]]]] */
 
     if( !psz_user ) psz_user = var_CreateGetString( p_access, "smb-user" );
-    if( !*psz_user ) { free( psz_user ); psz_user = 0; }
+    if( psz_user && !*psz_user ) { free( psz_user ); psz_user = 0; }
     if( !psz_pwd ) psz_pwd = var_CreateGetString( p_access, "smb-pwd" );
-    if( !*psz_pwd ) { free( psz_pwd ); psz_pwd = 0; }
+    if( psz_pwd && !*psz_pwd ) { free( psz_pwd ); psz_pwd = 0; }
     if( !psz_domain ) psz_domain = var_CreateGetString( p_access, "smb-domain" );
-    if( !*psz_domain ) { free( psz_domain ); psz_domain = 0; }
+    if( psz_domain && !*psz_domain ) { free( psz_domain ); psz_domain = 0; }
 
 #ifdef WIN32
     if( psz_user )
@@ -216,7 +216,6 @@ static int Open( vlc_object_t *p_this )
 #ifdef USE_CTX
     if( !(p_smb = smbc_new_context()) )
     {
-        msg_Err( p_access, "out of memory" );
         free( psz_uri );
         return VLC_ENOMEM;
     }
@@ -445,6 +444,7 @@ static void Win32AddConnection( access_t *p_access, char *psz_path,
     NETRESOURCE net_resource;
     DWORD i_result;
     char *psz_parser;
+    VLC_UNUSED( psz_domain );
 
     HINSTANCE hdll = LoadLibrary(_T("MPR.DLL"));
     if( !hdll )