diff options
Diffstat (limited to 'usr.bin/sort')
| -rw-r--r-- | usr.bin/sort/fields.c | 6 | ||||
| -rw-r--r-- | usr.bin/sort/sort.c | 16 | ||||
| -rw-r--r-- | usr.bin/sort/tmp.c | 6 |
3 files changed, 12 insertions, 16 deletions
diff --git a/usr.bin/sort/fields.c b/usr.bin/sort/fields.c index 8bab1ef118b..ece7618fff1 100644 --- a/usr.bin/sort/fields.c +++ b/usr.bin/sort/fields.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fields.c,v 1.7 2003/06/03 02:56:16 millert Exp $ */ +/* $OpenBSD: fields.c,v 1.8 2003/06/10 22:20:51 deraadt Exp $ */ /*- * Copyright (c) 1993 @@ -36,7 +36,7 @@ #if 0 static char sccsid[] = "@(#)fields.c 8.1 (Berkeley) 6/6/93"; #else -static char rcsid[] = "$OpenBSD: fields.c,v 1.7 2003/06/03 02:56:16 millert Exp $"; +static char rcsid[] = "$OpenBSD: fields.c,v 1.8 2003/06/10 22:20:51 deraadt Exp $"; #endif #endif /* not lint */ @@ -306,7 +306,7 @@ number(pos, bufend, line, lineend, Rflag) * rnum over (0,254) -> (255,REC_D+1),(REC_D-1,0)) */ void -num_init() +num_init(void) { int i; TENS[0] = REC_D <=128 ? 130 - '0' : 2 - '0'; diff --git a/usr.bin/sort/sort.c b/usr.bin/sort/sort.c index 50a74325c84..b0151b713c9 100644 --- a/usr.bin/sort/sort.c +++ b/usr.bin/sort/sort.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sort.c,v 1.20 2003/06/03 02:56:16 millert Exp $ */ +/* $OpenBSD: sort.c,v 1.21 2003/06/10 22:20:51 deraadt Exp $ */ /*- * Copyright (c) 1993 @@ -42,7 +42,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)sort.c 8.1 (Berkeley) 6/6/93"; #else -static char rcsid[] = "$OpenBSD: sort.c,v 1.20 2003/06/03 02:56:16 millert Exp $"; +static char rcsid[] = "$OpenBSD: sort.c,v 1.21 2003/06/10 22:20:51 deraadt Exp $"; #endif #endif /* not lint */ @@ -103,9 +103,7 @@ static void usage(char *); } int -main(argc, argv) - int argc; - char *argv[]; +main(int argc, char *argv[]) { int (*get)(); int ch, i, stdinflag = 0, tmp = 0; @@ -310,8 +308,7 @@ main(argc, argv) } static void -onsig(s) - int s; +onsig(int signo) { cleanup(); @@ -319,7 +316,7 @@ onsig(s) } static void -cleanup() +cleanup(void) { if (toutpath[0]) @@ -327,8 +324,7 @@ cleanup() } static void -usage(msg) - char *msg; +usage(char *msg) { extern char *__progname; diff --git a/usr.bin/sort/tmp.c b/usr.bin/sort/tmp.c index fa581af1ab6..6e13b84ab80 100644 --- a/usr.bin/sort/tmp.c +++ b/usr.bin/sort/tmp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tmp.c,v 1.5 2003/06/03 02:56:16 millert Exp $ */ +/* $OpenBSD: tmp.c,v 1.6 2003/06/10 22:20:51 deraadt Exp $ */ /*- * Copyright (c) 1993 @@ -36,7 +36,7 @@ #if 0 static char sccsid[] = "@(#)tmp.c 8.1 (Berkeley) 6/6/93"; #else -static char rcsid[] = "$OpenBSD: tmp.c,v 1.5 2003/06/03 02:56:16 millert Exp $"; +static char rcsid[] = "$OpenBSD: tmp.c,v 1.6 2003/06/10 22:20:51 deraadt Exp $"; #endif #endif /* not lint */ @@ -57,7 +57,7 @@ static char rcsid[] = "$OpenBSD: tmp.c,v 1.5 2003/06/03 02:56:16 millert Exp $"; #define _NAME_TMP "sort.XXXXXXXXXX" FILE * -ftmp() +ftmp(void) { sigset_t set, oset; FILE *fp; |