From 1c8956b91967617e2aef9b425fd0b82685e8b611 Mon Sep 17 00:00:00 2001 From: schwarze Date: Wed, 6 Nov 2013 22:26:14 +0000 Subject: Nowadays, seekdir(3) doesn't call _readdir_unlocked(). Consequently, the "skipdeleted" argument is always == 1. Remove it, effectively reverting readdir.c rev. 1.14. ok millert@ guenther@ --- lib/libc/gen/readdir_r.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/libc/gen/readdir_r.c') diff --git a/lib/libc/gen/readdir_r.c b/lib/libc/gen/readdir_r.c index a7fa14c65e2..cd70bd6f1bc 100644 --- a/lib/libc/gen/readdir_r.c +++ b/lib/libc/gen/readdir_r.c @@ -1,4 +1,4 @@ -/* $OpenBSD: readdir_r.c,v 1.4 2013/09/30 12:02:34 millert Exp $ */ +/* $OpenBSD: readdir_r.c,v 1.5 2013/11/06 22:26:14 schwarze Exp $ */ /* * Copyright (c) 1983, 1993 * The Regents of the University of California. All rights reserved. @@ -35,7 +35,7 @@ #include "telldir.h" #include "thread_private.h" -int _readdir_unlocked(DIR *, struct dirent **, int); +int _readdir_unlocked(DIR *, struct dirent **); int readdir_r(DIR *dirp, struct dirent *entry, struct dirent **result) @@ -43,7 +43,7 @@ readdir_r(DIR *dirp, struct dirent *entry, struct dirent **result) struct dirent *dp; _MUTEX_LOCK(&dirp->dd_lock); - if (_readdir_unlocked(dirp, &dp, 1) != 0) { + if (_readdir_unlocked(dirp, &dp) != 0) { _MUTEX_UNLOCK(&dirp->dd_lock); return errno; } -- cgit v1.2.3-59-g8ed1b