Changeset ff02bf907b6272b898612724634371bc95b8a5f1

Timestamp:

05/24/08 09:52:00 (3 months ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1211615520 +0300

git-parent:

[96cc9c261db1c616efa2fbc0aea21bc70b1e46fc]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1211615520 +0300

Message:

seekdir, telldir: unused, remove

Files:

• include/vlc_common.h (modified) (2 diffs)
• include/vlc_fixups.h (modified) (1 diff)
• src/extras/dirent.c (modified) (1 diff)
• src/extras/libc.c (modified) (2 diffs)

include/vlc_common.h

@@ -761 +761 @@
- 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!
@@ -770 +768 @@
-#   define _wclosedir vlc_wclosedir
-#   define rewinddir vlc_rewinddir
-#   define seekdir vlc_seekdir
-#   define telldir vlc_telldir
-#endif
-

include/vlc_fixups.h

@@ -146 +146 @@
-#   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
-

src/extras/dirent.c

@@ -343 +343 @@
-  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))
-        ;
-    }
-}

src/extras/libc.c

@@ -67 +67 @@
-#   undef _wclosedir
-#   undef rewinddir
-#   undef seekdir
-#   undef telldir
-#   define WIN32_LEAN_AND_MEAN
-#   include <windows.h>
@@ -523 +521 @@
-        _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
-