Libc-1439.100.3.tar.gz

[apple/libc.git] / gen / FreeBSD / closedir.c

diff --git a/gen/FreeBSD/closedir.c b/gen/FreeBSD/closedir.c
index 31dedc0345910e4d322fbdd48a4d66f373b84b49..e69e0ec7b379331c15a4cad849590df9385583bd 100644 (file)
--- a/gen/FreeBSD/closedir.c
+++ b/gen/FreeBSD/closedir.c
@@ -10,10 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -35,7 +31,7 @@
 static char sccsid[] = "@(#)closedir.c 8.1 (Berkeley) 6/10/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/closedir.c,v 1.10 2002/02/01 00:57:29 obrien Exp $");
+__FBSDID("$FreeBSD$");
 
 #include "namespace.h"
 #include <sys/types.h>
@@ -51,24 +47,29 @@ __FBSDID("$FreeBSD: src/lib/libc/gen/closedir.c,v 1.10 2002/02/01 00:57:29 obrie
 /*
  * close a directory.
  */
-int
-closedir(dirp)
-       DIR *dirp;
+static int
+_fdclosedir(DIR *dirp)
 {
        int fd;
 
        if (__isthreaded)
-               _pthread_mutex_lock((pthread_mutex_t *)&dirp->dd_lock);
-       _seekdir(dirp, dirp->dd_rewind);        /* free seekdir storage */
+               _pthread_mutex_lock(&dirp->dd_lock);
        fd = dirp->dd_fd;
        dirp->dd_fd = -1;
        dirp->dd_loc = 0;
        free((void *)dirp->dd_buf);
        _reclaim_telldir(dirp);
        if (__isthreaded) {
-               _pthread_mutex_unlock((pthread_mutex_t *)&dirp->dd_lock);
-               _pthread_mutex_destroy((pthread_mutex_t *)&dirp->dd_lock);
+               _pthread_mutex_unlock(&dirp->dd_lock);
+               _pthread_mutex_destroy(&dirp->dd_lock);
        }
        free((void *)dirp);
-       return(_close(fd));
+       return (fd);
+}
+
+int
+closedir(DIR *dirp)
+{
+
+       return (_close(_fdclosedir(dirp)));
 }