Module Name: src
Committed By: lukem
Date: Sun Apr 12 06:18:54 UTC 2009
Modified Files:
src/usr.bin/finger: finger.c lprint.c net.c util.c
Log Message:
Fix WARNS=4 issues (-Wshadow, -Wcast-qual, -Wsign-compare)
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/usr.bin/finger/finger.c
cvs rdiff -u -r1.21 -r1.22 src/usr.bin/finger/lprint.c
cvs rdiff -u -r1.22 -r1.23 src/usr.bin/finger/net.c
cvs rdiff -u -r1.27 -r1.28 src/usr.bin/finger/util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/finger/finger.c
diff -u src/usr.bin/finger/finger.c:1.28 src/usr.bin/finger/finger.c:1.29
--- src/usr.bin/finger/finger.c:1.28 Mon Jul 21 14:19:22 2008
+++ src/usr.bin/finger/finger.c Sun Apr 12 06:18:54 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: finger.c,v 1.28 2008/07/21 14:19:22 lukem Exp $ */
+/* $NetBSD: finger.c,v 1.29 2009/04/12 06:18:54 lukem Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -52,7 +52,7 @@
#if 0
static char sccsid[] = "@(#)finger.c 8.5 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: finger.c,v 1.28 2008/07/21 14:19:22 lukem Exp $");
+__RCSID("$NetBSD: finger.c,v 1.29 2009/04/12 06:18:54 lukem Exp $");
#endif
#endif /* not lint */
@@ -192,7 +192,7 @@
PERSON *pn;
DBT data, key;
struct passwd *pw;
- int r, sflag;
+ int r, seqflag;
struct utmpentry *ep;
for (ep = ehead; ep; ep = ep->next) {
@@ -204,10 +204,10 @@
enter_where(ep, pn);
}
if (db && lflag)
- for (sflag = R_FIRST;; sflag = R_NEXT) {
+ for (seqflag = R_FIRST;; seqflag = R_NEXT) {
PERSON *tmp;
- r = (*db->seq)(db, &key, &data, sflag);
+ r = (*db->seq)(db, &key, &data, seqflag);
if (r == -1)
err(1, "db seq");
if (r == 1)
@@ -223,7 +223,7 @@
PERSON *pn;
DBT data, key;
struct passwd *pw;
- int r, sflag, *used, *ip;
+ int r, seqflag, *used, *ip;
char **ap, **nargv, **np, **p;
struct utmpentry *ep;
@@ -284,10 +284,10 @@
enter_where(ep, pn);
}
if (db != NULL)
- for (sflag = R_FIRST;; sflag = R_NEXT) {
+ for (seqflag = R_FIRST;; seqflag = R_NEXT) {
PERSON *tmp;
- r = (*db->seq)(db, &key, &data, sflag);
+ r = (*db->seq)(db, &key, &data, seqflag);
if (r == -1)
err(1, "db seq");
if (r == 1)
Index: src/usr.bin/finger/lprint.c
diff -u src/usr.bin/finger/lprint.c:1.21 src/usr.bin/finger/lprint.c:1.22
--- src/usr.bin/finger/lprint.c:1.21 Wed Jan 4 01:17:54 2006
+++ src/usr.bin/finger/lprint.c Sun Apr 12 06:18:54 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: lprint.c,v 1.21 2006/01/04 01:17:54 perry Exp $ */
+/* $NetBSD: lprint.c,v 1.22 2009/04/12 06:18:54 lukem Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)lprint.c 8.3 (Berkeley) 4/28/95";
#else
-__RCSID( "$NetBSD: lprint.c,v 1.21 2006/01/04 01:17:54 perry Exp $");
+__RCSID( "$NetBSD: lprint.c,v 1.22 2009/04/12 06:18:54 lukem Exp $");
#endif
#endif /* not lint */
@@ -68,9 +68,9 @@
#define _PATH_PLAN ".plan"
#define _PATH_PROJECT ".project"
-static int demi_print(char *, int);
+static int demi_print(const char *, int);
static void lprint(PERSON *);
-static int show_text(char *, char *, char *);
+static int show_text(const char *, const char *, const char *);
static void vputc(int);
#ifdef __SVR4
@@ -263,7 +263,7 @@
}
static int
-demi_print(char *str, int oddfield)
+demi_print(const char *str, int oddfield)
{
static int lenlast;
int lenthis, maxlen;
@@ -301,7 +301,7 @@
}
static int
-show_text(char *directory, char *file_name, char *header)
+show_text(const char *directory, const char *file_name, const char *header)
{
struct stat sb;
FILE *fp;
@@ -316,7 +316,7 @@
return(0);
/* If short enough, and no newlines, show it on a single line.*/
- if (sb.st_size <= LINE_LEN - strlen(header) - 5) {
+ if (sb.st_size <= (off_t)(LINE_LEN - strlen(header) - 5)) {
nr = read(fd, tbuf, sizeof(tbuf));
if (nr <= 0) {
(void)close(fd);
Index: src/usr.bin/finger/net.c
diff -u src/usr.bin/finger/net.c:1.22 src/usr.bin/finger/net.c:1.23
--- src/usr.bin/finger/net.c:1.22 Wed Jan 4 01:17:54 2006
+++ src/usr.bin/finger/net.c Sun Apr 12 06:18:54 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: net.c,v 1.22 2006/01/04 01:17:54 perry Exp $ */
+/* $NetBSD: net.c,v 1.23 2009/04/12 06:18:54 lukem Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)net.c 8.4 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: net.c,v 1.22 2006/01/04 01:17:54 perry Exp $");
+__RCSID("$NetBSD: net.c,v 1.23 2009/04/12 06:18:54 lukem Exp $");
#endif
#endif /* not lint */
@@ -72,7 +72,7 @@
char *host;
struct addrinfo hints, *res, *res0;
int error;
- char *emsg = NULL;
+ const char *emsg = NULL;
lastc = 0;
if (!(host = strrchr(name, '@')))
Index: src/usr.bin/finger/util.c
diff -u src/usr.bin/finger/util.c:1.27 src/usr.bin/finger/util.c:1.28
--- src/usr.bin/finger/util.c:1.27 Sat May 5 16:55:17 2007
+++ src/usr.bin/finger/util.c Sun Apr 12 06:18:54 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.27 2007/05/05 16:55:17 christos Exp $ */
+/* $NetBSD: util.c,v 1.28 2009/04/12 06:18:54 lukem Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -72,7 +72,7 @@
#if 0
static char sccsid[] = "@(#)util.c 8.3 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: util.c,v 1.27 2007/05/05 16:55:17 christos Exp $");
+__RCSID("$NetBSD: util.c,v 1.28 2009/04/12 06:18:54 lukem Exp $");
#endif
#endif /* not lint */
@@ -171,7 +171,7 @@
}
if (fd == -1 ||
lseek(fd, (off_t)pn->uid * sizeof(ll), SEEK_SET) !=
- (long)pn->uid * sizeof(ll) ||
+ (off_t)pn->uid * (off_t)sizeof(ll) ||
read(fd, (char *)&ll, sizeof(ll)) != sizeof(ll)) {
/* as if never logged in */
ll.ll_line[0] = ll.ll_host[0] = '\0';
