protos

6 files changed, 22 insertions, 23 deletions

diff --git a/bin/csh/csh.h b/bin/csh/csh.h
index 08d69dd39b8..4579013a152 100644
--- a/bin/csh/csh.h
+++ b/bin/csh/csh.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: csh.h,v 1.14 2003/06/11 21:09:50 deraadt Exp $	*/
+/*	$OpenBSD: csh.h,v 1.15 2003/06/25 21:12:39 deraadt Exp $	*/
 /*	$NetBSD: csh.h,v 1.9 1995/03/21 09:02:40 cgd Exp $	*/
 
 /*-
@@ -419,7 +419,7 @@ struct varent {
 #define v_right		v_link[1]
 #define v_parent	v_link[2]
 
-struct varent *adrof1();
+struct varent *adrof1(Char *, struct varent *);
 
 #define adrof(v)	adrof1(v, &shvhed)
 #define value(v)	value1(v, &shvhed)
diff --git a/bin/csh/extern.h b/bin/csh/extern.h
index bac05844ef7..7a89b977a24 100644
--- a/bin/csh/extern.h
+++ b/bin/csh/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.13 2003/06/23 16:42:15 deraadt Exp $	*/
+/*	$OpenBSD: extern.h,v 1.14 2003/06/25 21:12:39 deraadt Exp $	*/
 /*	$NetBSD: extern.h,v 1.8 1996/10/31 23:50:54 christos Exp $	*/
 
 /*-
@@ -158,7 +158,7 @@ Char	 *globone(Char *, int);
 int	  Gmatch(Char *, Char *);
 void	  ginit(void);
 Char	**globall(Char **);
-void	  rscan(Char **, void (*)());
+void	  rscan(Char **, void (*)(int));
 void	  tglob(Char **);
 void	  trim(Char **);
 #ifdef FILEC
diff --git a/bin/csh/func.c b/bin/csh/func.c
index df814cb414a..b23f0437e00 100644
--- a/bin/csh/func.c
+++ b/bin/csh/func.c
@@ -1,4 +1,4 @@
-/*    $OpenBSD: func.c,v 1.19 2003/06/23 16:42:15 deraadt Exp $       */
+/*    $OpenBSD: func.c,v 1.20 2003/06/25 21:12:39 deraadt Exp $       */
 /*    $NetBSD: func.c,v 1.11 1996/02/09 02:28:29 christos Exp $       */
 
 /*-
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)func.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$OpenBSD: func.c,v 1.19 2003/06/23 16:42:15 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: func.c,v 1.20 2003/06/25 21:12:39 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -1148,7 +1148,6 @@ static  RLIM_TYPE
 getval(struct limits *lp, Char **v)
 {
     float f;
-    double  atof();
     Char   *cp = *v++;
 
     f = atof(short2str(cp));
@@ -1301,7 +1300,7 @@ dosuspend(Char **v, struct command *t)
 {
     int     ctpgrp;
 
-    void    (*old) ();
+    void    (*old) (int);
 
     if (loginsh)
 	stderror(ERR_SUSPLOG);
diff --git a/bin/csh/glob.c b/bin/csh/glob.c
index d3c5fad1756..c886c699994 100644
--- a/bin/csh/glob.c
+++ b/bin/csh/glob.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: glob.c,v 1.11 2003/06/11 21:09:50 deraadt Exp $	*/
+/*	$OpenBSD: glob.c,v 1.12 2003/06/25 21:12:39 deraadt Exp $	*/
 /*	$NetBSD: glob.c,v 1.10 1995/03/21 09:03:01 cgd Exp $	*/
 
 /*-
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)glob.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$OpenBSD: glob.c,v 1.11 2003/06/11 21:09:50 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: glob.c,v 1.12 2003/06/25 21:12:39 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -522,7 +522,7 @@ ginit(void)
 }
 
 void
-rscan(Char **t, void (*f)())
+rscan(Char **t, void (*f)(int))
 {
     Char *p;
 
diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c
index 882d3af1d1f..7200e77cf4f 100644
--- a/bin/ps/keyword.c
+++ b/bin/ps/keyword.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: keyword.c,v 1.18 2003/06/11 23:42:12 deraadt Exp $	*/
+/*	$OpenBSD: keyword.c,v 1.19 2003/06/25 21:12:45 deraadt Exp $	*/
 /*	$NetBSD: keyword.c,v 1.12.6.1 1996/05/30 21:25:13 cgd Exp $	*/
 
 /*-
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)keyword.c	8.5 (Berkeley) 4/2/94";
 #else
-static char rcsid[] = "$OpenBSD: keyword.c,v 1.18 2003/06/11 23:42:12 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: keyword.c,v 1.19 2003/06/25 21:12:45 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -245,7 +245,7 @@ findvar(char *p)
 {
 	VAR *v, key;
 	char *hp;
-	int vcmp();
+	int vcmp(const void *, const void *);
 
 	key.name = p;
 
diff --git a/bin/test/test.c b/bin/test/test.c
index a3c301e69b5..932fdba0ee9 100644
--- a/bin/test/test.c
+++ b/bin/test/test.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: test.c,v 1.7 2002/07/04 04:26:40 deraadt Exp $	*/
+/*	$OpenBSD: test.c,v 1.8 2003/06/25 21:12:50 deraadt Exp $	*/
 /*	$NetBSD: test.c,v 1.15 1995/03/21 07:04:06 cgd Exp $	*/
 
 /*
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: test.c,v 1.7 2002/07/04 04:26:40 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: test.c,v 1.8 2003/06/25 21:12:50 deraadt Exp $";
 #endif
 
 #include <sys/types.h>
@@ -142,7 +142,7 @@ struct t_op {
 char **t_wp;
 struct t_op const *t_wp_op;
 
-static enum token t_lex();
+static enum token t_lex(char *);
 static int oexpr(enum token n);
 static int aexpr(enum token n);
 static int nexpr(enum token n);
@@ -150,9 +150,9 @@ static int binop(void);
 static int primary(enum token n);
 static int filstat(char *nm, enum token mode);
 static int getn(const char *s);
-static int newerf();
-static int olderf();
-static int equalf();
+static int newerf(const char *, const char *);
+static int olderf(const char *, const char *);
+static int equalf(const char *, const char *);
 static void syntax(const char *op, char *msg);
 
 int
@@ -450,7 +450,7 @@ getn(const char *s)
 }
 
 static int
-newerf(char *f1, char *f2)
+newerf(const char *f1, const char *f2)
 {
 	struct stat b1, b2;
 
@@ -460,7 +460,7 @@ newerf(char *f1, char *f2)
 }
 
 static int
-olderf(char *f1, char *f2)
+olderf(const char *f1, const char *f2)
 {
 	struct stat b1, b2;
 
@@ -470,7 +470,7 @@ olderf(char *f1, char *f2)
 }
 
 static int
-equalf(char *f1, char *f2)
+equalf(const char *f1, const char *f2)
 {
 	struct stat b1, b2;