diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-12-06 03:33:06 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-12-06 03:33:06 +0000 |
| commit | bd7bace793536f027790396d6358c14299e8595b (patch) | |
| tree | dcc993baefecea2b27019336c4502e61d49b98c5 /libc/misc/dirent/readdir_r.c | |
| parent | 7608c85140162446c3830421eb94ae42a1bbb893 (diff) | |
| download | uClibc-alpine-bd7bace793536f027790396d6358c14299e8595b.tar.bz2 uClibc-alpine-bd7bace793536f027790396d6358c14299e8595b.tar.xz | |
Big merge from trunk. Stop the madness!
Diffstat (limited to 'libc/misc/dirent/readdir_r.c')
| -rw-r--r-- | libc/misc/dirent/readdir_r.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libc/misc/dirent/readdir_r.c b/libc/misc/dirent/readdir_r.c index 1c8eeadce..25cb80b63 100644 --- a/libc/misc/dirent/readdir_r.c +++ b/libc/misc/dirent/readdir_r.c @@ -5,7 +5,6 @@ #include <dirent.h> #include "dirstream.h" - int readdir_r(DIR *dir, struct dirent *entry, struct dirent **result) { int ret; @@ -18,9 +17,7 @@ int readdir_r(DIR *dir, struct dirent *entry, struct dirent **result) } de = NULL; -#ifdef __UCLIBC_HAS_THREADS__ __pthread_mutex_lock(&(dir->dd_lock)); -#endif do { if (dir->dd_size <= dir->dd_nextloc) { @@ -54,8 +51,7 @@ int readdir_r(DIR *dir, struct dirent *entry, struct dirent **result) all_done: -#ifdef __UCLIBC_HAS_THREADS__ __pthread_mutex_unlock(&(dir->dd_lock)); -#endif - return((de != NULL)? 0 : ret); + + return((de != NULL)? 0 : ret); } |