From: Rémi Denis-Courmont <rem@videolan.org>
Date: Sat, 24 May 2008 07:52:00 +0000 (+0300)
Subject: seekdir, telldir: unused, remove
X-Git-Tag: 0.9.0-test0~779
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=ff02bf907b6272b898612724634371bc95b8a5f1;p=vlc

seekdir, telldir: unused, remove
---

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 2780f445b7..1d142d7da7 100644
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -760,8 +760,6 @@ VLC_EXPORT( char *, vlc_strcasestr, ( const char *s1, const char *s2 ) );
  VLC_INTERNAL( struct _wdirent *, vlc_wreaddir, ( void * ) );
  VLC_EXPORT( int, vlc_wclosedir, ( void * ) );
  VLC_INTERNAL( void, vlc_rewinddir, ( void * ) );
- VLC_INTERNAL( void, vlc_seekdir, ( void *, long ) );
- VLC_INTERNAL( long, vlc_telldir, ( void * ) );
 #   define opendir Use_utf8_opendir_or_vlc_wopendir_instead!
 #   define readdir Use_utf8_readdir_or_vlc_wreaddir_instead!
 #   define closedir vlc_wclosedir
@@ -769,8 +767,6 @@ VLC_EXPORT( char *, vlc_strcasestr, ( const char *s1, const char *s2 ) );
 #   define _wreaddir vlc_wreaddir
 #   define _wclosedir vlc_wclosedir
 #   define rewinddir vlc_rewinddir
-#   define seekdir vlc_seekdir
-#   define telldir vlc_telldir
 #endif
 
 #if defined(WIN32) || defined(UNDER_CE)
diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
index 0bb3566ed5..1da896e6ef 100644
--- a/include/vlc_fixups.h
+++ b/include/vlc_fixups.h
@@ -145,14 +145,10 @@ struct dirent
 #   define readdir vlc_readdir
 #   define closedir vlc_closedir
 #   define rewinddir vlc_rewindir
-#   define seekdir vlc_seekdir
-#   define telldir vlc_telldir
 VLC_EXPORT( void *, vlc_opendir, ( const char * ) );
 VLC_EXPORT( void *, vlc_readdir, ( void * ) );
 VLC_EXPORT( int, vlc_closedir, ( void * ) );
 VLC_INTERNAL( void, vlc_rewinddir, ( void * ) );
-VLC_INTERNAL( void, vlc_seekdir, ( void *, long ) );
-VLC_INTERNAL( long, vlc_telldir, ( void * ) );
 #endif
 
 #ifndef HAVE_USELOCALE
diff --git a/src/extras/dirent.c b/src/extras/dirent.c
index 599fde6741..d0a0f33293 100644
--- a/src/extras/dirent.c
+++ b/src/extras/dirent.c
@@ -342,68 +342,3 @@ vlc_rewinddir (DIR * dirp)
   dirp->dd_handle = INVALID_HANDLE_VALUE;
   dirp->dd_stat = 0;
 }
-
-/*
- * telldir
- *
- * Returns the "position" in the "directory stream" which can be used with
- * seekdir to go back to an old entry. We simply return the value in stat.
- */
-long
-vlc_telldir (DIR * dirp)
-{
-  errno = 0;
-
-  if (!dirp)
-    {
-      errno = EFAULT;
-      return -1;
-    }
-  return dirp->dd_stat;
-}
-
-/*
- * seekdir
- *
- * Seek to an entry previously returned by telldir. We rewind the directory
- * and call readdir repeatedly until either dd_stat is the position number
- * or -1 (off the end). This is not perfect, in that the directory may
- * have changed while we weren't looking. But that is probably the case with
- * any such system.
- */
-void
-vlc_seekdir (DIR * dirp, long lPos)
-{
-  errno = 0;
-
-  if (!dirp)
-    {
-      errno = EFAULT;
-      return;
-    }
-
-  if (lPos < -1)
-    {
-      /* Seeking to an invalid position. */
-      errno = EINVAL;
-      return;
-    }
-  else if (lPos == -1)
-    {
-      /* Seek past end. */
-      if (dirp->dd_handle != INVALID_HANDLE_VALUE)
-        {
-          FindClose ((HANDLE)dirp->dd_handle);
-        }
-      dirp->dd_handle = INVALID_HANDLE_VALUE;
-      dirp->dd_stat = -1;
-    }
-  else
-    {
-      /* Rewind and read forward to the appropriate index. */
-      vlc_rewinddir (dirp);
-
-      while ((dirp->dd_stat < lPos) && vlc_readdir (dirp))
-        ;
-    }
-}
diff --git a/src/extras/libc.c b/src/extras/libc.c
index 99c59db677..4e091bc8c8 100644
--- a/src/extras/libc.c
+++ b/src/extras/libc.c
@@ -66,8 +66,6 @@
 #   undef _wreaddir
 #   undef _wclosedir
 #   undef rewinddir
-#   undef seekdir
-#   undef telldir
 #   define WIN32_LEAN_AND_MEAN
 #   include <windows.h>
 #endif
@@ -522,23 +520,6 @@ void vlc_rewinddir( void *_p_dir )
     if ( p_dir->p_real_dir != NULL )
         _wrewinddir( p_dir->p_real_dir );
 }
-
-void vlc_seekdir( void *_p_dir, long loc)
-{
-    vlc_DIR *p_dir = (vlc_DIR *)_p_dir;
-
-    if ( p_dir->p_real_dir != NULL )
-        _wseekdir( p_dir->p_real_dir, loc );
-}
-
-long vlc_telldir( void *_p_dir )
-{
-    vlc_DIR *p_dir = (vlc_DIR *)_p_dir;
-
-    if ( p_dir->p_real_dir != NULL )
-        return _wtelldir( p_dir->p_real_dir );
-    return 0;
-}
 #endif
 
 /*****************************************************************************