Merge branch 'master' into lpcm_encoder

[vlc] / src / extras / dirent.c

diff --git a/src/extras/dirent.c b/src/extras/dirent.c
index 599fde6741e88eb18d57ed11f66d96688b0e8618..d19b762890a5f4ee7dae03631116e4be719bab7d 100644 (file)
--- a/src/extras/dirent.c
+++ b/src/extras/dirent.c
@@ -20,17 +20,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#ifdef HAVE_ERRNO_H
-#   include <errno.h>
-#else
-    static int errno;
-    /* FIXME: anything clever to put here? */
-#   define EFAULT 12
-#   define ENOTDIR 12
-#   define ENOENT 12
-#   define ENOMEM 12
-#   define EINVAL 12
-#endif
+#include <errno.h>
 #include <string.h>
 #ifndef UNDER_CE
 #   include <io.h>
@@ -342,68 +332,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))
-        ;
-    }
-}