protos

7 files changed, 20 insertions, 21 deletions

diff --git a/usr.bin/asa/asa.c b/usr.bin/asa/asa.c
index 8fa539607d2..854ee908871 100644
--- a/usr.bin/asa/asa.c
+++ b/usr.bin/asa/asa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asa.c,v 1.4 2003/06/10 22:20:44 deraadt Exp $	*/
+/*	$OpenBSD: asa.c,v 1.5 2003/06/25 21:08:59 deraadt Exp $	*/
 /*	$NetBSD: asa.c,v 1.10 1995/04/21 03:01:41 cgd Exp $	*/
 
 /*
@@ -32,14 +32,14 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: asa.c,v 1.4 2003/06/10 22:20:44 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: asa.c,v 1.5 2003/06/25 21:08:59 deraadt Exp $";
 #endif
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <err.h>
 
-static void asa();
+static void asa(FILE *);
 
 int
 main(int argc, char *argv[])
diff --git a/usr.bin/checknr/checknr.c b/usr.bin/checknr/checknr.c
index 55ea439326d..d42ef90f041 100644
--- a/usr.bin/checknr/checknr.c
+++ b/usr.bin/checknr/checknr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: checknr.c,v 1.10 2003/06/10 22:20:45 deraadt Exp $	*/
+/*	$OpenBSD: checknr.c,v 1.11 2003/06/25 21:09:09 deraadt Exp $	*/
 /*	$NetBSD: checknr.c,v 1.4 1995/03/26 04:10:19 glass Exp $	*/
 
 /*
@@ -40,7 +40,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)checknr.c	8.1 (Berkeley) 6/6/93";
 #else 
-static char rcsid[] = "$OpenBSD: checknr.c,v 1.10 2003/06/10 22:20:45 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: checknr.c,v 1.11 2003/06/25 21:09:09 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -53,6 +53,8 @@ static char rcsid[] = "$OpenBSD: checknr.c,v 1.10 2003/06/10 22:20:45 deraadt Ex
  */
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
 #include <ctype.h>
 
 #define MAXSTK	100	/* Stack size */
@@ -188,8 +190,6 @@ int	sflag;		/* -s: ignore \s */
 int	ncmds;		/* size of knowncmds */
 int	slot;		/* slot in knowncmds found by binsrch */
 
-char	*malloc();
-
 int
 main(int argc, char *argv[])
 {
diff --git a/usr.bin/rpcgen/rpc_parse.c b/usr.bin/rpcgen/rpc_parse.c
index e815939739e..e6671c24f3b 100644
--- a/usr.bin/rpcgen/rpc_parse.c
+++ b/usr.bin/rpcgen/rpc_parse.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rpc_parse.c,v 1.12 2003/04/26 18:29:51 pvalchev Exp $	*/
+/*	$OpenBSD: rpc_parse.c,v 1.13 2003/06/25 21:09:26 deraadt Exp $	*/
 /*	$NetBSD: rpc_parse.c,v 1.5 1995/08/29 23:05:55 cgd Exp $	*/
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -64,7 +64,7 @@ static void unsigned_dec(char **);
  * return the next definition you see
  */
 definition *
-get_definition()
+get_definition(void)
 {
 	definition *defp;
 	token tok;
diff --git a/usr.bin/rpcgen/rpc_parse.h b/usr.bin/rpcgen/rpc_parse.h
index 3f3a6aeecd8..0e27817bd24 100644
--- a/usr.bin/rpcgen/rpc_parse.h
+++ b/usr.bin/rpcgen/rpc_parse.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rpc_parse.h,v 1.6 2002/07/05 05:39:42 deraadt Exp $	*/
+/*	$OpenBSD: rpc_parse.h,v 1.7 2003/06/25 21:09:26 deraadt Exp $	*/
 /*	$NetBSD: rpc_parse.h,v 1.3 1995/06/11 21:50:00 pk Exp $	*/
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -157,7 +157,7 @@ struct definition {
 };
 typedef struct definition definition;
 
-definition *get_definition();
+definition *get_definition(void);
 
 struct bas_type {
 	char *name;
diff --git a/usr.bin/rpcgen/rpc_util.c b/usr.bin/rpcgen/rpc_util.c
index 528ade2106c..66effcc278f 100644
--- a/usr.bin/rpcgen/rpc_util.c
+++ b/usr.bin/rpcgen/rpc_util.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rpc_util.c,v 1.10 2002/07/05 05:39:42 deraadt Exp $	*/
+/*	$OpenBSD: rpc_util.c,v 1.11 2003/06/25 21:09:26 deraadt Exp $	*/
 /*	$NetBSD: rpc_util.c,v 1.6 1995/08/29 23:05:57 cgd Exp $	*/
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -96,8 +96,7 @@ definition *
 findval(lst, val, cmp)
 	list *lst;
 	char *val;
-	int (*cmp) ();
-
+	int (*cmp) (definition *, char *);
 {
 
 	for (; lst != NULL; lst = lst->next) {
diff --git a/usr.bin/rpcgen/rpc_util.h b/usr.bin/rpcgen/rpc_util.h
index a9cc50f12b2..b03a677fa4d 100644
--- a/usr.bin/rpcgen/rpc_util.h
+++ b/usr.bin/rpcgen/rpc_util.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rpc_util.h,v 1.11 2002/07/05 05:39:42 deraadt Exp $	*/
+/*	$OpenBSD: rpc_util.h,v 1.12 2003/06/25 21:09:26 deraadt Exp $	*/
 /*	$NetBSD: rpc_util.h,v 1.3 1995/06/11 21:50:10 pk Exp $	*/
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -91,12 +91,12 @@ extern int nonfatalerrors;
 /*
  * rpc_util routines 
  */
-void storeval();
+void storeval(list **, definition *);
 
 #define STOREVAL(list,item)	\
 	storeval(list,item)
 
-definition *findval();
+definition *findval(list *, char *, int (*)(definition *, char *));
 
 #define FINDVAL(list,item,finder) \
 	findval(list, item, finder)
diff --git a/usr.bin/tftp/main.c b/usr.bin/tftp/main.c
index db8c273732a..45f06c6fbf7 100644
--- a/usr.bin/tftp/main.c
+++ b/usr.bin/tftp/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.15 2003/06/25 15:45:10 deraadt Exp $	*/
+/*	$OpenBSD: main.c,v 1.16 2003/06/25 21:09:37 deraadt Exp $	*/
 /*	$NetBSD: main.c,v 1.6 1995/05/21 16:54:10 mycroft Exp $	*/
 
 /*
@@ -40,7 +40,7 @@ static const char copyright[] =
 #if 0
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
 #endif
-static const char rcsid[] = "$OpenBSD: main.c,v 1.15 2003/06/25 15:45:10 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: main.c,v 1.16 2003/06/25 21:09:37 deraadt Exp $";
 #endif /* not lint */
 
 /* Many bug fixes are from Jim Guyton <guyton@rand-unix> */
@@ -85,7 +85,7 @@ int	margc;
 char	*margv[MAXARGV+1];
 char	*prompt = "tftp";
 jmp_buf	toplevel;
-void	intr();
+void	intr(int);
 struct	servent *sp;
 
 void	get(int, char **);
@@ -539,7 +539,7 @@ status(int argc, char *argv[])
 }
 
 void
-intr(void)
+intr(int signo)
 {
 
 	signal(SIGALRM, SIG_IGN);