[src/trunk]: src Fix opendir30 screwup and sort the compat defs for clarity.

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/65bce8da2866
branches:  trunk
changeset: 584387:65bce8da2866
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Sep 14 20:20:15 2005 +0000

description:
Fix opendir30 screwup and sort the compat defs for clarity.

diffstat:

 include/dirent.h                 |   3 +--
 lib/libc/compat/include/dirent.h |  19 +++++++++++++++----
 2 files changed, 16 insertions(+), 6 deletions(-)

diffs (65 lines):

diff -r 97d5097895e1 -r 65bce8da2866 include/dirent.h
--- a/include/dirent.h  Wed Sep 14 19:58:57 2005 +0000
+++ b/include/dirent.h  Wed Sep 14 20:20:15 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dirent.h,v 1.24 2005/09/13 01:44:32 christos Exp $     */
+/*     $NetBSD: dirent.h,v 1.25 2005/09/14 20:20:15 christos Exp $     */
 
 /*-
  * Copyright (c) 1989, 1993
@@ -88,7 +88,6 @@
 void rewinddir(DIR *);
 #ifndef __LIBC12_SOURCE__
 DIR *opendir(const char *) __RENAME(__opendir30);
-DIR *__opendir30(const char *) __RENAME(__opendir30);
 struct dirent *readdir(DIR *) __RENAME(__readdir30);
 int readdir_r(DIR *, struct dirent * __restrict,
     struct dirent ** __restrict) __RENAME(__readdir_r30);
diff -r 97d5097895e1 -r 65bce8da2866 lib/libc/compat/include/dirent.h
--- a/lib/libc/compat/include/dirent.h  Wed Sep 14 19:58:57 2005 +0000
+++ b/lib/libc/compat/include/dirent.h  Wed Sep 14 20:20:15 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dirent.h,v 1.1 2005/09/13 01:44:09 christos Exp $      */
+/*     $NetBSD: dirent.h,v 1.2 2005/09/14 20:20:15 christos Exp $      */
 
 /*-
  * Copyright (c) 1989, 1993
@@ -37,24 +37,35 @@
 #include <compat/sys/dirent.h>
 
 __BEGIN_DECLS
+
 DIR *opendir(const char *);
-struct dirent12 *readdir(DIR *);
+DIR *__opendir30(const char *);
+
 int readdir_r(DIR *, struct dirent12 * __restrict,
     struct dirent12 ** __restrict);
-struct dirent *__readdir30(DIR *);
 int __readdir_r30(DIR *, struct dirent * __restrict,
     struct dirent ** __restrict);
+
+struct dirent12 *readdir(DIR *);
+struct dirent *__readdir30(DIR *);
+
 #if defined(_NETBSD_SOURCE)
+
 DIR *__opendir2(const char *, int);
 DIR *__opendir230(const char *, int);
+
 int scandir(const char *, struct dirent12 ***,
     int (*)(const struct dirent12 *), int (*)(const void *, const void *));
 int __scandir30(const char *, struct dirent ***,
     int (*)(const struct dirent *), int (*)(const void *, const void *));
+
 int getdents(int, char *, size_t);
+int __getdents30(int, char *, size_t);
+
 int getdirentries(int, char *, int, long *);
-int __getdents30(int, char *, size_t);
+
 #endif /* defined(_NETBSD_SOURCE) */
+
 __END_DECLS
 
 #endif /* !_COMPAT_DIRENT_H_ */