Removes trailing spaces. Removes tabs.

[vlc] / modules / access / file.c

diff --git a/modules/access/file.c b/modules/access/file.c
index 3a621f8d31d55c5610f661dc3c0ffe2f45f5ffa5..01aa0e28a177ff2b2123070c07c1a0b3842d252b 100644 (file)
--- a/modules/access/file.c
+++ b/modules/access/file.c
@@ -27,11 +27,10 @@
  * Preamble
  *****************************************************************************/
 #include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <vlc_interaction.h>
+#include <vlc_input.h>
+#include <vlc_access.h>
+#include <vlc_interface.h>
 
-#include <stdlib.h>
-#include <string.h>
 #include <errno.h>
 #ifdef HAVE_SYS_TYPES_H
 #   include <sys/types.h>
@@ -51,9 +50,6 @@
 #endif
 
 #if defined( WIN32 ) && !defined( UNDER_CE )
-/* fstat() support for large files on win32 */
-#   define fstat(a,b) _fstati64(a,b)
-#   define FILESTAT _stati64 
 #   ifdef lseek
 #      undef lseek
 #   endif
@@ -68,11 +64,9 @@
 #      undef lseek
 #   endif
 #   define lseek fseek
-#else
-#   define FILESTAT stat
 #endif
 
-#include "charset.h"
+#include <vlc_charset.h>
 
 /*****************************************************************************
  * Module descriptor
@@ -95,7 +89,7 @@ vlc_module_begin();
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACCESS );
     add_integer( "file-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
-    add_deprecated( "file-cat", VLC_TRUE );
+    add_obsolete_string( "file-cat" );
     set_capability( "access2", 50 );
     add_shortcut( "file" );
     add_shortcut( "stream" );
@@ -169,7 +163,7 @@ static int Open( vlc_object_t *p_this )
         fd = open_file (p_access, p_access->psz_path);
 
 #ifdef HAVE_SYS_STAT_H
-    struct FILESTAT st;
+    struct stat st;
 
     while (fd != -1)
     {
@@ -211,8 +205,6 @@ static int Open( vlc_object_t *p_this )
         Close (p_this);
         return VLC_EGENERIC;
     }
-    msg_Dbg (p_access, "opened file of size "I64Fd" (FIXME: remove this)",
-             p_access->info.i_size);
 
     return VLC_SUCCESS;
 }
@@ -302,7 +294,7 @@ static int Read( access_t *p_access, uint8_t *p_buffer, int i_len )
     if( p_access->info.i_size != 0 &&
         (p_sys->i_nb_reads % INPUT_FSTAT_NB_READS) == 0 )
     {
-        struct FILESTAT st;
+        struct stat st;
 
         if ((fstat (fd, &st) == 0)
          && (p_access->info.i_size != st.st_size))
@@ -438,7 +430,7 @@ static int open_file (access_t *p_access, const char *psz_name)
     if ( !p_sys->fd )
     {
         msg_Err( p_access, "cannot open file %s", psz_name );
-        intf_UserFatal( p_access, VLC_FALSE, _("File reading failed"), 
+        intf_UserFatal( p_access, VLC_FALSE, _("File reading failed"),
                         _("VLC could not open file \"%s\"."), psz_name );
         free (path);
         return VLC_EGENERIC;
@@ -450,11 +442,12 @@ static int open_file (access_t *p_access, const char *psz_name)
     fseek( p_sys->fd, 0, SEEK_SET );
 #else
     int fd = utf8_open (path, O_RDONLY | O_NONBLOCK /* O_LARGEFILE*/, 0666);
+    free (path);
     if (fd == -1)
     {
         msg_Err (p_access, "cannot open file %s (%s)", psz_name,
                  strerror (errno));
-        intf_UserFatal (p_access, VLC_FALSE, _("File reading failed"), 
+        intf_UserFatal (p_access, VLC_FALSE, _("File reading failed"),
                         _("VLC could not open file \"%s\" (%s)."),
                         psz_name, strerror (errno));
         return -1;