Removes trailing spaces. Removes tabs.

[vlc] / modules / access / smb.c

diff --git a/modules/access/smb.c b/modules/access/smb.c
index 727fa1343c135b289debac585cf5a27e598e9584..b7672a9ca6dc3fc1388e3983529f0b6a9a366115 100644 (file)
--- a/modules/access/smb.c
+++ b/modules/access/smb.c
@@ -24,10 +24,10 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>
+
 
 #include <vlc/vlc.h>
-#include <vlc/input.h>
+#include <vlc_access.h>
 
 #ifdef WIN32
 #ifdef HAVE_FCNTL_H
@@ -109,8 +109,8 @@ struct access_sys_t
 static void Win32AddConnection( access_t *, char *, char *, char *, char * );
 #endif
 
-void smb_auth( const char *srv, const char *shr, char *wg, int wglen,
-               char *un, int unlen, char *pw, int pwlen )
+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;
 }
@@ -226,7 +226,7 @@ static int Open( vlc_object_t *p_this )
         return VLC_EGENERIC;
     }
 
-    if( !(p_file = p_smb->open( p_smb, psz_uri, O_RDONLY, 0 )) )
+    if( !(p_file = (p_smb->open)( p_smb, psz_uri, O_RDONLY, 0 )) )
     {
         msg_Err( p_access, "open failed for '%s' (%s)",
                  p_access->psz_path, strerror(errno) );
@@ -235,11 +235,12 @@ static int Open( vlc_object_t *p_this )
         return VLC_EGENERIC;
     }
 
-    p_access->info.i_size = 0;
+    /* Init p_access */
+    STANDARD_READ_ACCESS_INIT;
+
     i_ret = p_smb->fstat( p_smb, p_file, &filestat );
     if( i_ret ) msg_Err( p_access, "stat failed (%s)", strerror(errno) );
     else p_access->info.i_size = filestat.st_size;
-
 #else
 
 #ifndef WIN32
@@ -250,6 +251,14 @@ static int Open( vlc_object_t *p_this )
     }
 #endif
 
+/*
+** some version of glibc defines open as a macro, causing havoc
+** with other macros using 'open' under the hood, such as the
+** following one:
+*/
+#if defined(smbc_open) && defined(open)
+# undef open
+#endif
     if( (i_smb = smbc_open( psz_uri, O_RDONLY, 0 )) < 0 )
     {
         msg_Err( p_access, "open failed for '%s' (%s)",
@@ -258,7 +267,9 @@ static int Open( vlc_object_t *p_this )
         return VLC_EGENERIC;
     }
 
-    p_access->info.i_size = 0;
+    /* Init p_access */
+    STANDARD_READ_ACCESS_INIT;
+
     i_ret = smbc_fstat( i_smb, &filestat );
     if( i_ret ) msg_Err( p_access, "stat failed (%s)", strerror(i_ret) );
     else p_access->info.i_size = filestat.st_size;
@@ -266,19 +277,6 @@ static int Open( vlc_object_t *p_this )
 
     free( psz_uri );
 
-    /* Init p_access */
-    p_access->pf_read = Read;
-    p_access->pf_block = NULL;
-    p_access->pf_seek = Seek;
-    p_access->pf_control = Control;
-    p_access->info.i_update = 0;
-    p_access->info.i_pos = 0;
-    p_access->info.b_eof = VLC_FALSE;
-    p_access->info.i_title = 0;
-    p_access->info.i_seekpoint = 0;
-    p_access->p_sys = p_sys = malloc( sizeof( access_sys_t ) );
-    memset( p_sys, 0, sizeof( access_sys_t ) );
-
 #ifdef USE_CTX
     p_sys->p_smb = p_smb;
     p_sys->p_file = p_file;
@@ -476,7 +474,7 @@ static void Win32AddConnection( access_t *p_access, char *psz_path,
     {
         msg_Dbg( p_access, "connected to %s", psz_remote );
     }
-    else if( i_result != ERROR_ALREADY_ASSIGNED && 
+    else if( i_result != ERROR_ALREADY_ASSIGNED &&
              i_result != ERROR_DEVICE_ALREADY_REMEMBERED )
     {
         msg_Dbg( p_access, "already connected to %s", psz_remote );