=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/touch/touch.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- src/usr.bin/touch/touch.c 2003/06/03 02:56:20 1.9 +++ src/usr.bin/touch/touch.c 2003/06/10 22:20:53 1.10 @@ -1,4 +1,4 @@ -/* $OpenBSD: touch.c,v 1.9 2003/06/03 02:56:20 millert Exp $ */ +/* $OpenBSD: touch.c,v 1.10 2003/06/10 22:20:53 deraadt Exp $ */ /* $NetBSD: touch.c,v 1.11 1995/08/31 22:10:06 jtc Exp $ */ /* @@ -40,7 +40,7 @@ #if 0 static char sccsid[] = "@(#)touch.c 8.2 (Berkeley) 4/28/95"; #endif -static char rcsid[] = "$OpenBSD: touch.c,v 1.9 2003/06/03 02:56:20 millert Exp $"; +static char rcsid[] = "$OpenBSD: touch.c,v 1.10 2003/06/10 22:20:53 deraadt Exp $"; #endif /* not lint */ #include @@ -65,9 +65,7 @@ void usage(void); int -main(argc, argv) - int argc; - char *argv[]; +main(int argc, char *argv[]) { struct stat sb; struct timeval tv[2]; @@ -187,9 +185,7 @@ #define ATOI2(s) ((s) += 2, ((s)[-2] - '0') * 10 + ((s)[-1] - '0')) void -stime_arg1(arg, tvp) - char *arg; - struct timeval *tvp; +stime_arg1(char *arg, struct timeval *tvp) { struct tm *t; time_t tmptime; @@ -248,10 +244,7 @@ } void -stime_arg2(arg, year, tvp) - char *arg; - int year; - struct timeval *tvp; +stime_arg2(char *arg, int year, struct timeval *tvp) { struct tm *t; time_t tmptime; @@ -284,9 +277,7 @@ } void -stime_file(fname, tvp) - char *fname; - struct timeval *tvp; +stime_file(char *fname, struct timeval *tvp) { struct stat sb; @@ -297,10 +288,7 @@ } int -rw(fname, sbp, force) - char *fname; - struct stat *sbp; - int force; +rw(char *fname, struct stat *sbp, int force) { int fd, needed_chmod, rval; u_char byte; @@ -349,7 +337,7 @@ } __dead void -usage() +usage(void) { (void)fprintf(stderr, "usage: touch [-acfm] [-r file] [-t time] file ...\n");