First pass prototype removals from auditing header files:

a.out.h to libgen.h (omitting complex.h for a later separate
effort for the math stuff)

5 files changed, 23 insertions, 66 deletions

diff --git a/include/dirent.h b/include/dirent.h
index 8079d7097..006e5dcb2 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -200,10 +200,6 @@ extern long int telldir (DIR *__dirp) __THROW;
 /* Return the file descriptor used by DIRP.  */
 extern int dirfd (DIR *__dirp) __THROW;
 
-# if defined __OPTIMIZE__ && defined _DIR_dirfd
-#  define dirfd(dirp)	_DIR_dirfd (dirp)
-# endif
-
 # ifndef MAXNAMLEN
 /* Get the definitions of the POSIX.1 limits.  */
 #  include <bits/posix1_lim.h>
@@ -270,53 +266,6 @@ extern int alphasort64 (__const void *__e1, __const void *__e2)
      __THROW __attribute_pure__;
 # endif
 
-# ifdef __USE_GNU
-/* Function to compare two `struct dirent's by name & version.  */
-#  ifndef __USE_FILE_OFFSET64
-extern int versionsort (__const void *__e1, __const void *__e2)
-     __THROW __attribute_pure__;
-#  else
-#   ifdef __REDIRECT
-extern int __REDIRECT (versionsort,
-		       (__const void *__e1, __const void *__e2)
-		       __THROW,
-		       versionsort64) __attribute_pure__;
-#   else
-#    define versionsort versionsort64
-#   endif
-#  endif
-
-#  ifdef __USE_LARGEFILE64
-extern int versionsort64 (__const void *__e1, __const void *__e2)
-     __THROW __attribute_pure__;
-#  endif
-# endif
-
-/* Read directory entries from FD into BUF, reading at most NBYTES.
-   Reading starts at offset *BASEP, and *BASEP is updated with the new
-   position after reading.  Returns the number of bytes read; zero when at
-   end of directory; or -1 for errors.  */
-# ifndef __USE_FILE_OFFSET64
-extern __ssize_t getdirentries (int __fd, char *__restrict __buf,
-				size_t __nbytes,
-				__off_t *__restrict __basep) __THROW;
-# else
-#  ifdef __REDIRECT
-extern __ssize_t __REDIRECT (getdirentries,
-			     (int __fd, char *__restrict __buf,
-			      size_t __nbytes,
-			      __off64_t *__restrict __basep) __THROW,
-			     getdirentries64);
-#  else
-#   define getdirentries getdirentries64
-#  endif
-# endif
-
-# ifdef __USE_LARGEFILE64
-extern __ssize_t getdirentries64 (int __fd, char *__restrict __buf,
-				  size_t __nbytes,
-				  __off64_t *__restrict __basep) __THROW;
-# endif
 
 #endif /* Use BSD or misc.  */
 
diff --git a/include/dlfcn.h b/include/dlfcn.h
index 3fe4d0266..6dc4a5ab8 100644
--- a/include/dlfcn.h
+++ b/include/dlfcn.h
@@ -21,10 +21,13 @@
 #define	_DLFCN_H 1
 
 #include <features.h>
+#define __need_size_t
+#include <stddef.h>
 
 /* Collect various system dependent definitions and declarations.  */
 #include <bits/dlfcn.h>
 
+
 #ifdef __USE_GNU
 /* If the first argument of `dlsym' or `dlvsym' is set to RTLD_NEXT
    the run-time address of the symbol called NAME in the next shared
@@ -53,14 +56,6 @@ extern int dlclose (void *__handle) __THROW;
 extern void *dlsym (void *__restrict __handle,
 		    __const char *__restrict __name) __THROW;
 
-#ifdef __USE_GNU
-/* Find the run-time address in the shared object HANDLE refers to
-   of the symbol called NAME with VERSION.  */
-extern void *dlvsym (void *__restrict __handle,
-		     __const char *__restrict __name,
-		     __const char *__restrict __version) __THROW;
-#endif
-
 /* When any of the above functions fails, call this function
    to return a string describing the error.  Each call resets
    the error string so that a following call returns null.  */
@@ -80,6 +75,10 @@ typedef struct
 /* Fill in *INFO with the following information about ADDRESS.
    Returns 0 iff no shared object's segments contain that address.  */
 extern int dladdr (const void *__address, Dl_info *__info) __THROW;
+
+/* Get information about the shared objects currently loaded */
+extern int dlinfo (void);
+
 #endif
 
 __END_DECLS
diff --git a/include/elf.h b/include/elf.h
index 94bb4f84e..ce37414f1 100644
--- a/include/elf.h
+++ b/include/elf.h
@@ -604,6 +604,7 @@ typedef struct
 #define NT_FPREGSET	2		/* Contains copy of fpregset struct */
 #define NT_PRPSINFO	3		/* Contains copy of prpsinfo struct */
 #define NT_PRXREG	4		/* Contains copy of prxregset struct */
+#define NT_TASKSTRUCT	4		/* Contains copy of task structure */
 #define NT_PLATFORM	5		/* String from sysinfo(SI_PLATFORM) */
 #define NT_AUXV		6		/* Contains copy of auxv array */
 #define NT_GWINDOWS	7		/* Contains copy of gwindows struct */
@@ -967,7 +968,14 @@ typedef struct
 
 /* A special ignored value for PPC, used by the kernel to control the
    interpretation of the AUXV. Must be > 16.  */
-#define AT_IGNOREPPC	22		/* Entry should be ignored */
+#define AT_IGNOREPPC	22		/* Entry should be ignored.  */
+
+#define	AT_SECURE	23		/* Boolean, was exec setuid-like?  */
+
+/* Pointer to the global system page used for system calls and other
+   nice things.  */
+#define AT_SYSINFO	32
+#define AT_SYSINFO_EHDR	33
 
 
 /* Note section contents.  Each entry in the note section begins with
@@ -1017,6 +1025,7 @@ typedef struct
 #define ELF_NOTE_OS_LINUX	0
 #define ELF_NOTE_OS_GNU		1
 #define ELF_NOTE_OS_SOLARIS2	2
+#define ELF_NOTE_OS_FREEBSD	3
 
 
 /* Move records.  */
diff --git a/include/fcntl.h b/include/fcntl.h
index 1ab84f2a9..2f2fb99dd 100644
--- a/include/fcntl.h
+++ b/include/fcntl.h
@@ -132,6 +132,11 @@ extern int lockf64 (int __fd, int __cmd, __off64_t __len) __THROW;
 # endif
 #endif
 
+
+#if 0
+
+/* FIXME -- uClibc should probably implement these... */
+
 #ifdef __USE_XOPEN2K
 /* Advice the system about the expected behaviour of the application with
    respect to the file associated with FD.  */
@@ -170,6 +175,7 @@ extern int posix_fallocate64 (int __fd, __off64_t __offset, size_t __len)
      __THROW;
 # endif
 #endif
+#endif
 
 __END_DECLS
 
diff --git a/include/grp.h b/include/grp.h
index 33247718a..48cce31e3 100644
--- a/include/grp.h
+++ b/include/grp.h
@@ -136,12 +136,6 @@ extern int fgetgrent_r (FILE *__restrict __stream,
 /* Set the group set for the current user to GROUPS (N of them).  */
 extern int setgroups (size_t __n, __const __gid_t *__groups) __THROW;
 
-/* Store at most *NGROUPS members of the group set for USER into
-   *GROUPS.  Also include GROUP.  The actual number of groups found is
-   returned in *NGROUPS.  Return -1 if the if *NGROUPS is too small.  */
-extern int getgrouplist (__const char *__user, __gid_t __group,
-			 __gid_t *__groups, int *__ngroups) __THROW;
-
 /* Initialize the group set for the current user
    by reading the group database and using all groups
    of which USER is a member.  Also include GROUP.  */