diff options
| author | markm <markm@FreeBSD.org> | 2001-12-11 22:22:15 +0000 |
|---|---|---|
| committer | markm <markm@FreeBSD.org> | 2001-12-11 22:22:15 +0000 |
| commit | c6dc21807ec81299fd28bdfc0038d9c348d5a057 (patch) | |
| tree | d70251823241f957076823d8b2df76f2b56dfc7b /usr.bin/wall/wall.c | |
| parent | a23dd012ce322b8a5d7bc4f7782a442edd8c2854 (diff) | |
| download | FreeBSD-src-c6dc21807ec81299fd28bdfc0038d9c348d5a057.zip FreeBSD-src-c6dc21807ec81299fd28bdfc0038d9c348d5a057.tar.gz | |
WARNS=2 fix, use __FBSDID().
Not added to Makefile as WARNS=2 will be made default.
Diffstat (limited to 'usr.bin/wall/wall.c')
| -rw-r--r-- | usr.bin/wall/wall.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/usr.bin/wall/wall.c b/usr.bin/wall/wall.c index 3e25676..b34f648 100644 --- a/usr.bin/wall/wall.c +++ b/usr.bin/wall/wall.c @@ -31,19 +31,19 @@ * SUCH DAMAGE. */ +#include <sys/cdefs.h> + +__FBSDID("$FreeBSD$"); + #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1988, 1990, 1993\n\ The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ +#endif #ifndef lint -#if 0 -static char sccsid[] = "@(#)wall.c 8.2 (Berkeley) 11/16/93"; +static const char sccsid[] = "@(#)wall.c 8.2 (Berkeley) 11/16/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ /* * This program is not related to David Wall, whose Stanford Ph.D. thesis @@ -150,7 +150,7 @@ main(int argc, char *argv[]) if (!pw) continue; for (g = grouplist; g && ingroup == 0; g = g->next) { - if (g->gid == -1) + if (g->gid == (gid_t)-1) continue; if (g->gid == pw->pw_gid) ingroup = 1; @@ -192,7 +192,8 @@ makemsg(char *fname) time_t now; FILE *fp; int fd; - char *p, *tty, hostname[MAXHOSTNAMELEN], lbuf[256], tmpname[64]; + char *p, hostname[MAXHOSTNAMELEN], lbuf[256], tmpname[64]; + const char *tty; const char *whom; gid_t egid; @@ -290,7 +291,7 @@ makemsg(char *fname) mbufsize = sbuf.st_size; if (!(mbuf = malloc((u_int)mbufsize))) err(1, "out of memory"); - if (fread(mbuf, sizeof(*mbuf), mbufsize, fp) != mbufsize) + if ((int)fread(mbuf, sizeof(*mbuf), mbufsize, fp) != mbufsize) err(1, "can't read temporary file"); (void)close(fd); } |
