summaryrefslogtreecommitdiff
path: root/usr.bin/join/join.c
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2002-02-16 21:28:12 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2002-02-16 21:28:12 +0000
commit6d57a1a176004a7d8fc009cdcf760098f86e3263 (patch)
treeee423c619fad03813234b9362694a17f3a638f0b /usr.bin/join/join.c
parentc707cb295fc3cac8d8feb343e949e0dcf71b8476 (diff)
Part one of userland __P removal. Done with a simple regexp with some minor hand editing to make comments line up correctly. Another pass is forthcoming that handles the cases that could not be done automatically.
Diffstat (limited to 'usr.bin/join/join.c')
-rw-r--r--usr.bin/join/join.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/usr.bin/join/join.c b/usr.bin/join/join.c
index a49fc67bb7c..00b1d43ed5d 100644
--- a/usr.bin/join/join.c
+++ b/usr.bin/join/join.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: join.c,v 1.13 2001/01/29 01:57:59 niklas Exp $ */
+/* $OpenBSD: join.c,v 1.14 2002/02/16 21:27:47 millert Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -45,7 +45,7 @@ static char copyright[] =
#ifndef lint
/*static char sccsid[] = "@(#)join.c 8.6 (Berkeley) 5/4/95"; */
-static char rcsid[] = "$OpenBSD: join.c,v 1.13 2001/01/29 01:57:59 niklas Exp $";
+static char rcsid[] = "$OpenBSD: join.c,v 1.14 2002/02/16 21:27:47 millert Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -103,16 +103,16 @@ int spans = 1; /* span multiple delimiters (-t) */
char *empty; /* empty field replacement string (-e) */
char *tabchar = " \t"; /* delimiter characters (-t) */
-int cmp __P((LINE *, u_long, LINE *, u_long));
-void fieldarg __P((char *));
-void joinlines __P((INPUT *, INPUT *));
-void obsolete __P((char **));
-void outfield __P((LINE *, u_long, int));
-void outoneline __P((INPUT *, LINE *));
-void outtwoline __P((INPUT *, LINE *, INPUT *, LINE *));
-void slurp __P((INPUT *));
-void slurpit __P((INPUT *));
-void usage __P((void));
+int cmp(LINE *, u_long, LINE *, u_long);
+void fieldarg(char *);
+void joinlines(INPUT *, INPUT *);
+void obsolete(char **);
+void outfield(LINE *, u_long, int);
+void outoneline(INPUT *, LINE *);
+void outtwoline(INPUT *, LINE *, INPUT *, LINE *);
+void slurp(INPUT *);
+void slurpit(INPUT *);
+void usage(void);
int
main(argc, argv)