Another time "Remove useless test before a free".

[vlc] / modules / access / smb.c

diff --git a/modules/access/smb.c b/modules/access/smb.c
index a86cb3cb9a10a18775d10e015f02e44cfb3284dc..b14629c58debf17f0e22031f1ed890bfaee50eb5 100644 (file)
--- a/modules/access/smb.c
+++ b/modules/access/smb.c
@@ -26,6 +26,10 @@
  *****************************************************************************/
 
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
 #include <vlc_access.h>
 
@@ -91,7 +95,7 @@ vlc_module_end();
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
-static int Read( access_t *, uint8_t *, int );
+static ssize_t Read( access_t *, uint8_t *, size_t );
 static int Seek( access_t *, int64_t );
 static int Control( access_t *, int, va_list );
 
@@ -184,11 +188,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 && !*psz_user ) { free( psz_user ); psz_user = 0; }
+    if( !*psz_user ) { free( psz_user ); psz_user = 0; }
     if( !psz_pwd ) psz_pwd = var_CreateGetString( p_access, "smb-pwd" );
-    if( psz_pwd && !*psz_pwd ) { free( psz_pwd ); psz_pwd = 0; }
+    if( !*psz_pwd ) { free( psz_pwd ); psz_pwd = 0; }
     if(!psz_domain) psz_domain = var_CreateGetString( p_access, "smb-domain" );
-    if( psz_domain && !*psz_domain ) { free( psz_domain ); psz_domain = 0; }
+    if( !*psz_domain ) { free( psz_domain ); psz_domain = 0; }
 
 #ifdef WIN32
     if( psz_user )
@@ -204,9 +208,9 @@ static int Open( vlc_object_t *p_this )
         asprintf( &psz_uri, "smb://%s", psz_path );
 #endif
 
-    if( psz_user ) free( psz_user );
-    if( psz_pwd ) free( psz_pwd );
-    if( psz_domain ) free( psz_domain );
+    free( psz_user );
+    free( psz_pwd );
+    free( psz_domain );
 
 #ifdef USE_CTX
     if( !(p_smb = smbc_new_context()) )
@@ -348,7 +352,7 @@ static int Seek( access_t *p_access, int64_t i_pos )
 /*****************************************************************************
  * Read:
  *****************************************************************************/
-static int Read( access_t *p_access, uint8_t *p_buffer, int i_len )
+static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len )
 {
     access_sys_t *p_sys = p_access->p_sys;
     int i_read;