=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/who/who.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- src/usr.bin/who/who.c 2003/06/03 02:56:23 1.15 +++ src/usr.bin/who/who.c 2003/06/10 22:20:54 1.16 @@ -1,4 +1,4 @@ -/* $OpenBSD: who.c,v 1.15 2003/06/03 02:56:23 millert Exp $ */ +/* $OpenBSD: who.c,v 1.16 2003/06/10 22:20:54 deraadt Exp $ */ /* $NetBSD: who.c,v 1.4 1994/12/07 04:28:49 jtc Exp $ */ /* @@ -43,7 +43,7 @@ #if 0 static char sccsid[] = "@(#)who.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: who.c,v 1.15 2003/06/03 02:56:23 millert Exp $"; +static char rcsid[] = "$OpenBSD: who.c,v 1.16 2003/06/10 22:20:54 deraadt Exp $"; #endif /* not lint */ #include @@ -75,9 +75,7 @@ #define HOST_WIDTH 32 int -main(argc, argv) - int argc; - char **argv; +main(int argc, char *argv[]) { struct utmp usr; FILE *ufp; @@ -183,8 +181,7 @@ } void -who_am_i(ufp) - FILE *ufp; +who_am_i(FILE *ufp) { struct utmp usr; struct passwd *pw; @@ -214,8 +211,7 @@ } void -output(up) - struct utmp *up; +output(struct utmp *up) { struct stat sb; char line[sizeof(_PATH_DEV) + sizeof (up->ut_line)]; @@ -267,7 +263,7 @@ } void -output_labels() +output_labels(void) { (void)printf("%-*.*s ", NAME_WIDTH, UT_NAMESIZE, "USER"); @@ -286,8 +282,7 @@ } FILE * -file(name) - char *name; +file(char *name) { FILE *ufp; @@ -299,7 +294,7 @@ } void -usage() +usage(void) { (void)fprintf(stderr, "usage: who [-mqTuH] [ file ]\n who am i\n"); exit(1);