===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/join/join.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- src/usr.bin/join/join.c	2003/06/03 02:56:09	1.15
+++ src/usr.bin/join/join.c	2003/06/10 22:20:47	1.16
@@ -1,4 +1,4 @@
-/* $OpenBSD: join.c,v 1.15 2003/06/03 02:56:09 millert Exp $	*/
+/* $OpenBSD: join.c,v 1.16 2003/06/10 22:20:47 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993, 1994
@@ -41,7 +41,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "@(#)join.c	8.6 (Berkeley) 5/4/95"; */
-static char rcsid[] = "$OpenBSD: join.c,v 1.15 2003/06/03 02:56:09 millert Exp $";
+static char rcsid[] = "$OpenBSD: join.c,v 1.16 2003/06/10 22:20:47 deraadt Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -111,9 +111,7 @@
 void usage(void);
 
 int
-main(argc, argv)
-	int argc;
-	char *argv[];
+main(int argc, char *argv[])
 {
 	INPUT *F1, *F2;
 	int aflag, ch, cval, vflag;
@@ -283,8 +281,7 @@
 }
 
 /* wrapper around slurpit() to keep track of what field we are on */
-void slurp(F)
-	INPUT *F;
+void slurp(INPUT *F)
 {
 	long fpos;
 	u_long cfieldc;
@@ -305,8 +302,7 @@
 }	
 
 void
-slurpit(F)
-	INPUT *F;
+slurpit(INPUT *F)
 {
 	LINE *lp, *lastlp, tmp;
 	size_t len;
@@ -399,9 +395,7 @@
 }
 
 int
-cmp(lp1, fieldno1, lp2, fieldno2)
-	LINE *lp1, *lp2;
-	u_long fieldno1, fieldno2;
+cmp(LINE *lp1, u_long fieldno1, LINE *lp2, u_long fieldno2)
 {
 	if (lp1->fieldcnt <= fieldno1)
 		return (-1);
@@ -411,8 +405,7 @@
 }
 
 void
-joinlines(F1, F2)
-	INPUT *F1, *F2;
+joinlines(INPUT *F1, INPUT *F2)
 {
 	int cnt1, cnt2;
 
@@ -432,9 +425,7 @@
 }
 
 void
-outoneline(F, lp)
-	INPUT *F;
-	LINE *lp;
+outoneline(INPUT *F, LINE *lp)
 {
 	int cnt;
 
@@ -460,9 +451,7 @@
 }
 
 void
-outtwoline(F1, lp1, F2, lp2)
-	INPUT *F1, *F2;
-	LINE *lp1, *lp2;
+outtwoline(INPUT *F1, LINE *lp1, INPUT *F2, LINE *lp2)
 {
 	int cnt;
 
@@ -493,10 +482,7 @@
 }
 
 void
-outfield(lp, fieldno, out_empty)
-	LINE *lp;
-	u_long fieldno;
-	int out_empty;
+outfield(LINE *lp, u_long fieldno, int out_empty)
 {
 	if (needsep++)
 		putchar((int)*tabchar);
@@ -519,8 +505,7 @@
  * fields.
  */
 void
-fieldarg(option)
-	char *option;
+fieldarg(char *option)
 {
 	u_long fieldno;
 	char *end, *token;
@@ -548,8 +533,7 @@
 }
 
 void
-obsolete(argv)
-	char **argv;
+obsolete(char **argv)
 {
 	int len;
 	char **p, *ap, *t;
@@ -628,7 +612,7 @@
 }
 
 void
-usage()
+usage(void)
 {
 	(void)fprintf(stderr, "%s%s\n",
 	    "usage: join [-a fileno | -v fileno ] [-e string] [-1 field] ",