protos

10 files changed, 34 insertions, 15 deletions

diff --git a/lib/libc/crypt/bcrypt.c b/lib/libc/crypt/bcrypt.c
index dec0093dd8c..35959d1fc44 100644
--- a/lib/libc/crypt/bcrypt.c
+++ b/lib/libc/crypt/bcrypt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bcrypt.c,v 1.16 2002/02/19 19:39:36 millert Exp $	*/
+/*	$OpenBSD: bcrypt.c,v 1.17 2003/06/25 21:16:47 deraadt Exp $	*/
 
 /*
  * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
@@ -172,6 +172,8 @@ bcrypt_gensalt(u_int8_t log_rounds)
 /* We handle $Vers$log2(NumRounds)$salt+passwd$
    i.e. $2$04$iwouldntknowwhattosayetKdJ6iFtacBqJdKe6aW7ou */
 
+char   *bcrypt(const char *key, const char *salt);
+
 char   *
 bcrypt(key, salt)
 	const char   *key;
diff --git a/lib/libc/crypt/md5crypt.c b/lib/libc/crypt/md5crypt.c
index 048858494c2..fb09b375e60 100644
--- a/lib/libc/crypt/md5crypt.c
+++ b/lib/libc/crypt/md5crypt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: md5crypt.c,v 1.11 2003/04/02 20:35:29 millert Exp $	*/
+/*	$OpenBSD: md5crypt.c,v 1.12 2003/06/25 21:16:47 deraadt Exp $	*/
 
 /*
  * ----------------------------------------------------------------------------
@@ -13,7 +13,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: md5crypt.c,v 1.11 2003/04/02 20:35:29 millert Exp $";
+static char rcsid[] = "$OpenBSD: md5crypt.c,v 1.12 2003/06/25 21:16:47 deraadt Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <unistd.h>
@@ -45,6 +45,8 @@ to64(s, v, n)
  * Use MD5 for what it is best at...
  */
 
+char *md5crypt(const char *pw, const char *salt);
+
 char *
 md5crypt(pw, salt)
 	register const char *pw;
diff --git a/lib/libc/gen/getgrouplist.c b/lib/libc/gen/getgrouplist.c
index fe74b0c3b75..70119e05a3a 100644
--- a/lib/libc/gen/getgrouplist.c
+++ b/lib/libc/gen/getgrouplist.c
@@ -28,7 +28,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: getgrouplist.c,v 1.8 2003/06/02 20:18:34 millert Exp $";
+static char rcsid[] = "$OpenBSD: getgrouplist.c,v 1.9 2003/06/25 21:16:47 deraadt Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
@@ -36,6 +36,7 @@ static char rcsid[] = "$OpenBSD: getgrouplist.c,v 1.8 2003/06/02 20:18:34 miller
  */
 #include <sys/types.h>
 #include <string.h>
+#include <unistd.h>
 #include <grp.h>
 
 int
diff --git a/lib/libc/gen/getpwent.c b/lib/libc/gen/getpwent.c
index ee14e8016d0..fafe24a9ed7 100644
--- a/lib/libc/gen/getpwent.c
+++ b/lib/libc/gen/getpwent.c
@@ -29,7 +29,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: getpwent.c,v 1.30 2003/06/02 20:18:34 millert Exp $";
+static char rcsid[] = "$OpenBSD: getpwent.c,v 1.31 2003/06/25 21:16:47 deraadt Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
@@ -79,6 +79,7 @@ static int __ypexclude_add(const char *);
 static int __ypexclude_is(const char *);
 static void __ypexclude_free(void);
 static void __ypproto_set(void);
+static int __ypparse(struct passwd *pw, char *s);
 
 /* macro for deciding which YP maps to use. */
 #define PASSWD_BYNAME \
diff --git a/lib/libc/gen/glob.c b/lib/libc/gen/glob.c
index ec491759751..cd1438d218a 100644
--- a/lib/libc/gen/glob.c
+++ b/lib/libc/gen/glob.c
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)glob.c	8.3 (Berkeley) 10/13/93";
 #else
-static char rcsid[] = "$OpenBSD: glob.c,v 1.21 2003/06/02 20:18:34 millert Exp $";
+static char rcsid[] = "$OpenBSD: glob.c,v 1.22 2003/06/25 21:16:47 deraadt Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -601,7 +601,7 @@ glob3(pathbuf, pathbuf_last, pathend, pathend_last, pattern, pattern_last,
 	 * and dirent.h as taking pointers to differently typed opaque
 	 * structures.
 	 */
-	struct dirent *(*readdirfunc)();
+	struct dirent *(*readdirfunc)(void *);
 
 	if (pathend > pathend_last)
 		return (1);
@@ -626,7 +626,7 @@ glob3(pathbuf, pathbuf_last, pathend, pathend_last, pattern, pattern_last,
 	if (pglob->gl_flags & GLOB_ALTDIRFUNC)
 		readdirfunc = pglob->gl_readdir;
 	else
-		readdirfunc = readdir;
+		readdirfunc = (struct dirent *(*)(void *))readdir;
 	while ((dp = (*readdirfunc)(dirp))) {
 		register u_char *sc;
 		register Char *dc;
diff --git a/lib/libc/gen/login_cap.c b/lib/libc/gen/login_cap.c
index 53d965c6717..31d7ba9f672 100644
--- a/lib/libc/gen/login_cap.c
+++ b/lib/libc/gen/login_cap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: login_cap.c,v 1.16 2003/03/31 15:47:03 millert Exp $	*/
+/*	$OpenBSD: login_cap.c,v 1.17 2003/06/25 21:16:47 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1995,1997 Berkeley Software Design, Inc. All rights reserved.
@@ -57,6 +57,7 @@ static	int setuserpath(login_cap_t *, char *);
 static	u_quad_t multiply(u_quad_t, u_quad_t);
 static	u_quad_t strtolimit(char *, char **, int);
 static	u_quad_t strtosize(char *, char **, int);
+static	int gsetrl(login_cap_t *lc, int what, char *name, int type);
 
 login_cap_t *
 login_getclass(class)
diff --git a/lib/libc/gen/nlist.c b/lib/libc/gen/nlist.c
index 220e9d2731b..f143916d883 100644
--- a/lib/libc/gen/nlist.c
+++ b/lib/libc/gen/nlist.c
@@ -28,7 +28,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: nlist.c,v 1.44 2003/06/02 20:18:34 millert Exp $";
+static char rcsid[] = "$OpenBSD: nlist.c,v 1.45 2003/06/25 21:16:47 deraadt Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -53,6 +53,14 @@ static char rcsid[] = "$OpenBSD: nlist.c,v 1.44 2003/06/02 20:18:34 millert Exp
 #include <sys/exec_ecoff.h>
 #endif
 
+int	__fdnlist(int, struct nlist *);
+int	__aout_fdnlist(int, struct nlist *);
+int	__ecoff_fdnlist(int, struct nlist *);
+int	__elf_fdnlist(int, struct nlist *);
+#ifdef _NLIST_DO_ELF
+int	__elf_is_okay__(register Elf_Ehdr *ehdr);
+#endif
+
 #define	ISLAST(p)	(p->n_un.n_name == 0 || p->n_un.n_name[0] == 0)
 
 #ifdef _NLIST_DO_AOUT
diff --git a/lib/libc/gen/telldir.c b/lib/libc/gen/telldir.c
index 405f6c1a6cf..c8ded8c56f2 100644
--- a/lib/libc/gen/telldir.c
+++ b/lib/libc/gen/telldir.c
@@ -28,7 +28,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: telldir.c,v 1.3 2003/06/02 20:18:35 millert Exp $";
+static char rcsid[] = "$OpenBSD: telldir.c,v 1.4 2003/06/25 21:16:47 deraadt Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
@@ -62,6 +62,8 @@ struct ddloc {
 static long	dd_loccnt;	/* Index of entry for sequential readdir's */
 static struct	ddloc *dd_hash[NDIRHASH];   /* Hash list heads for ddlocs */
 
+void __seekdir(DIR *, long);
+
 /*
  * return a pointer into a directory
  */
diff --git a/lib/libc/gen/timezone.c b/lib/libc/gen/timezone.c
index 8af63278454..1f6c9e5d37d 100644
--- a/lib/libc/gen/timezone.c
+++ b/lib/libc/gen/timezone.c
@@ -28,7 +28,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: timezone.c,v 1.6 2003/06/02 20:18:35 millert Exp $";
+static char rcsid[] = "$OpenBSD: timezone.c,v 1.7 2003/06/25 21:16:47 deraadt Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -38,7 +38,7 @@ static char rcsid[] = "$OpenBSD: timezone.c,v 1.6 2003/06/02 20:18:35 millert Ex
 #include <string.h>
 #include <tzfile.h>
 
-char *_tztab();
+char *_tztab(int, int);
 
 /*
  * timezone --
diff --git a/lib/libc/gmon/gmon.c b/lib/libc/gmon/gmon.c
index c76d508dbf9..4628b1f3198 100644
--- a/lib/libc/gmon/gmon.c
+++ b/lib/libc/gmon/gmon.c
@@ -28,7 +28,7 @@
  */
 
 #if !defined(lint) && defined(LIBC_SCCS)
-static char rcsid[] = "$OpenBSD: gmon.c,v 1.15 2003/06/02 20:18:35 millert Exp $";
+static char rcsid[] = "$OpenBSD: gmon.c,v 1.16 2003/06/25 21:16:47 deraadt Exp $";
 #endif
 
 #include <sys/param.h>
@@ -55,6 +55,8 @@ static int	s_scale;
 
 void	moncontrol(int);
 static int hertz(void);
+void	monstartup(u_long lowpc, u_long highpc);
+void	_mcleanup(void);
 
 void
 monstartup(lowpc, highpc)
@@ -122,7 +124,7 @@ monstartup(lowpc, highpc)
 }
 
 void
-_mcleanup()
+_mcleanup(void)
 {
 	int fd;
 	int fromindex;