diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2003-06-10 22:20:55 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2003-06-10 22:20:55 +0000 |
| commit | b8aaa8bec8414f8e55cf9b61fe0873d242c773b8 (patch) | |
| tree | 5e43016c4fae834239fd38972fd58355ed6b54b5 /usr.bin/error | |
| parent | f18f6607440f6d2da08fac3522d88a65c77a5f3e (diff) | |
mostly ansi cleanup; pval ok
Diffstat (limited to 'usr.bin/error')
| -rw-r--r-- | usr.bin/error/main.c | 23 | ||||
| -rw-r--r-- | usr.bin/error/pi.c | 7 |
2 files changed, 12 insertions, 18 deletions
diff --git a/usr.bin/error/main.c b/usr.bin/error/main.c index c5ff50f4eba..39c83776d92 100644 --- a/usr.bin/error/main.c +++ b/usr.bin/error/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.9 2003/06/03 02:56:07 millert Exp $ */ +/* $OpenBSD: main.c,v 1.10 2003/06/10 22:20:46 deraadt Exp $ */ /* $NetBSD: main.c,v 1.3 1995/09/02 06:15:37 jtc Exp $ */ /* @@ -40,7 +40,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: main.c,v 1.9 2003/06/03 02:56:07 millert Exp $"; +static char rcsid[] = "$OpenBSD: main.c,v 1.10 2003/06/10 22:20:46 deraadt Exp $"; #endif /* not lint */ #include <signal.h> @@ -116,9 +116,7 @@ void usage(); * Default: stdin */ int -main(argc, argv) - int argc; - char *argv[]; +main(int argc, char *argv[]) { char *ignorename = 0; char **ed_argv; /* return from touchfiles */ @@ -227,9 +225,7 @@ main(argc, argv) } void -forkvi(argc, argv) - int argc; - char **argv; +forkvi(int argc, char **argv) { if (query) { switch (inquire(terse ? "Edit? " : @@ -254,10 +250,7 @@ forkvi(argc, argv) } void -try(name, argc, argv) - char *name; - int argc; - char **argv; +try(char *name, int argc, char **argv) { argv[0] = name; wordvprint(stdout, argc, argv); @@ -274,8 +267,8 @@ try(name, argc, argv) execvp(name, argv); } -int errorsort(epp1, epp2) - Eptr *epp1, *epp2; +int +errorsort(Eptr *epp1, Eptr *epp2) { reg Eptr ep1, ep2; int order; @@ -307,7 +300,7 @@ int errorsort(epp1, epp2) } void -usage() +usage(void) { extern char *__progname; diff --git a/usr.bin/error/pi.c b/usr.bin/error/pi.c index 238c10d8765..05bd4db66f9 100644 --- a/usr.bin/error/pi.c +++ b/usr.bin/error/pi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pi.c,v 1.5 2003/06/03 02:56:07 millert Exp $ */ +/* $OpenBSD: pi.c,v 1.6 2003/06/10 22:20:46 deraadt Exp $ */ /* $NetBSD: pi.c,v 1.3 1995/09/02 06:15:44 jtc Exp $ */ /* @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)pi.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: pi.c,v 1.5 2003/06/03 02:56:07 millert Exp $"; +static char rcsid[] = "$OpenBSD: pi.c,v 1.6 2003/06/10 22:20:46 deraadt Exp $"; #endif /* not lint */ #include <stdio.h> @@ -204,7 +204,8 @@ boolean piptr(string) extern int wordc; extern char **wordv; -Errorclass pi() +Errorclass +pi(void) { char **nwordv; |