=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rs/rs.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- src/usr.bin/rs/rs.c 2003/06/03 02:56:15 1.8 +++ src/usr.bin/rs/rs.c 2003/06/10 22:20:50 1.9 @@ -1,4 +1,4 @@ -/* $OpenBSD: rs.c,v 1.8 2003/06/03 02:56:15 millert Exp $ */ +/* $OpenBSD: rs.c,v 1.9 2003/06/10 22:20:50 deraadt Exp $ */ /*- * Copyright (c) 1993 @@ -105,9 +105,7 @@ } while(0) int -main(argc, argv) - int argc; - char *argv[]; +main(int argc, char *argv[]) { getargs(argc, argv); getfile(); @@ -121,7 +119,7 @@ } void -getfile() +getfile(void) { char *p; char *endp; @@ -187,7 +185,7 @@ } void -putfile() +putfile(void) { char **ep; int i, j, n; @@ -212,9 +210,7 @@ } void -prints(s, col) - char *s; - int col; +prints(char *s, int col) { int n; char *p = s; @@ -232,8 +228,7 @@ } void -usage(msg, s) - char *msg, *s; +usage(char *msg, char *s) { warnx(msg, s); fprintf(stderr, @@ -242,7 +237,7 @@ } void -prepfile() +prepfile(void) { char **ep; int i; @@ -335,7 +330,7 @@ char ibuf[BSIZE]; /* two screenfuls should do */ int -getline() /* get line; maintain curline, curlen; manage storage */ +getline(void) /* get line; maintain curline, curlen; manage storage */ { static int putlength; static char *endblock = ibuf + BSIZE; @@ -368,8 +363,7 @@ } char ** -getptrs(sp) - char **sp; +getptrs(char **sp) { char **p; @@ -384,9 +378,7 @@ } void -getargs(ac, av) - int ac; - char *av[]; +getargs(int ac, char *av[]) { char *p; @@ -495,9 +487,7 @@ } char * -getlist(list, p) - short **list; - char *p; +getlist(short **list, char *p) { int count = 1; char *t; @@ -527,10 +517,10 @@ return(t - 1); } +/* num = number p points to; if (strict) complain */ +/* returns pointer to end of num */ char * -getnum(num, p, strict) /* num = number p points to; if (strict) complain */ - int *num, strict; /* returns pointer to end of num */ - char *p; +getnum(int *num, char *p, int strict) { char *t = p;