diff options
author | ru <ru@FreeBSD.org> | 2000-10-23 12:18:34 +0000 |
---|---|---|
committer | ru <ru@FreeBSD.org> | 2000-10-23 12:18:34 +0000 |
commit | 7885ad000050949f99433ec9baa0babf83709052 (patch) | |
tree | 92873b0fb1e6a6053e23c2b62d1613084b6e8d00 /usr.bin/finger | |
parent | 7b50f6cc73be199a04244c314383955c70c6ae82 (diff) | |
download | FreeBSD-src-7885ad000050949f99433ec9baa0babf83709052.zip FreeBSD-src-7885ad000050949f99433ec9baa0babf83709052.tar.gz |
-Wall cleanup.
PR: 22187
Diffstat (limited to 'usr.bin/finger')
-rw-r--r-- | usr.bin/finger/finger.c | 2 | ||||
-rw-r--r-- | usr.bin/finger/lprint.c | 17 | ||||
-rw-r--r-- | usr.bin/finger/net.c | 4 |
3 files changed, 10 insertions, 13 deletions
diff --git a/usr.bin/finger/finger.c b/usr.bin/finger/finger.c index be54131..53ea144 100644 --- a/usr.bin/finger/finger.c +++ b/usr.bin/finger/finger.c @@ -45,7 +45,7 @@ */ #ifndef lint -static char copyright[] = +static const char copyright[] = "@(#) Copyright (c) 1989, 1993\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ diff --git a/usr.bin/finger/lprint.c b/usr.bin/finger/lprint.c index 688f16e..11da686 100644 --- a/usr.bin/finger/lprint.c +++ b/usr.bin/finger/lprint.c @@ -174,8 +174,7 @@ lprint(pn) maxlen = len; /* find rest of entries for user */ for (w = pn->whead; w != NULL; w = w->next) { - switch (w->info) { - case LOGGEDIN: + if (w->info == LOGGEDIN) { tp = localtime(&w->loginat); strftime(t, sizeof(t), "%c", tp); tzn = tp->tm_zone; @@ -204,12 +203,9 @@ lprint(pn) } if (!w->writable) cpr += printf(" (messages off)"); - break; - case LASTLOG: - if (w->loginat == 0) { - (void)printf("Never logged in."); - break; - } + } else if (w->loginat == 0) { + cpr = printf("Never logged in."); + } else { tp = localtime(&w->loginat); strftime(t, sizeof(t), "%c", tp); tzn = tp->tm_zone; @@ -220,7 +216,6 @@ lprint(pn) else cpr = printf("Last login %.16s (%s) on %s", t, tzn, w->tty); - break; } if (*w->host) { if (LINE_LEN < (cpr + 6 + strlen(w->host))) @@ -298,6 +293,8 @@ show_text(directory, file_name, header) register char *p, lastc; int fd, nr; + lastc = '\0'; + (void)snprintf(tbuf, sizeof(tbuf), "%s/%s", directory, file_name); if ((fd = open(tbuf, O_RDONLY)) < 0 || fstat(fd, &sb) || sb.st_size == 0) @@ -353,7 +350,7 @@ vputc(ch) meta = 1; } else meta = 0; - if (isprint(ch) || !meta && (ch == ' ' || ch == '\t' || ch == '\n')) + if (isprint(ch) || (!meta && (ch == ' ' || ch == '\t' || ch == '\n'))) (void)putchar(ch); else { (void)putchar('^'); diff --git a/usr.bin/finger/net.c b/usr.bin/finger/net.c index 427d233..388ea33 100644 --- a/usr.bin/finger/net.c +++ b/usr.bin/finger/net.c @@ -118,7 +118,7 @@ netfinger(name) static int do_protocol(const char *name, const struct addrinfo *ai) { - int cnt, error, line_len, s; + int cnt, line_len, s; register FILE *fp; register int c, lastc; struct iovec iov[3]; @@ -145,7 +145,7 @@ do_protocol(const char *name, const struct addrinfo *ai) iov[msg.msg_iovlen++].iov_len = 3; } /* send the name followed by <CR><LF> */ - iov[msg.msg_iovlen].iov_base = name; + iov[msg.msg_iovlen].iov_base = (char *)name; iov[msg.msg_iovlen++].iov_len = strlen(name); iov[msg.msg_iovlen].iov_base = "\r\n"; iov[msg.msg_iovlen++].iov_len = 2; |