Module Name: src
Committed By: lukem
Date: Mon Apr 13 04:35:37 UTC 2009
Modified Files:
src/usr.bin/rdist: defs.h docmd.c expand.c gram.y lookup.c server.c
Log Message:
Fix WARNS=4 issues (-Wshadow -Wcast-qual -Wsign-compare)
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/rdist/defs.h
cvs rdiff -u -r1.27 -r1.28 src/usr.bin/rdist/docmd.c
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/rdist/expand.c
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/rdist/gram.y
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/rdist/lookup.c
cvs rdiff -u -r1.30 -r1.31 src/usr.bin/rdist/server.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/rdist/defs.h
diff -u src/usr.bin/rdist/defs.h:1.17 src/usr.bin/rdist/defs.h:1.18
--- src/usr.bin/rdist/defs.h:1.17 Sat Mar 18 09:46:35 2006
+++ src/usr.bin/rdist/defs.h Mon Apr 13 04:35:36 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.17 2006/03/18 09:46:35 christos Exp $ */
+/* $NetBSD: defs.h,v 1.18 2009/04/13 04:35:36 lukem Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -149,7 +149,7 @@
extern uid_t userid; /* user's user ID */
extern gid_t groupid; /* user's group ID */
-int any(int, char *);
+int any(int, const char *);
char *colon(char *);
void cleanup(int);
void define(char *);
@@ -179,5 +179,5 @@
void freesubcmd(struct subcmd *);
void prnames(struct namelist *);
void server(void);
-void yyerror(char *);
+void yyerror(const char *);
int yyparse(void);
Index: src/usr.bin/rdist/docmd.c
diff -u src/usr.bin/rdist/docmd.c:1.27 src/usr.bin/rdist/docmd.c:1.28
--- src/usr.bin/rdist/docmd.c:1.27 Mon Dec 18 15:14:42 2006
+++ src/usr.bin/rdist/docmd.c Mon Apr 13 04:35:36 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: docmd.c,v 1.27 2006/12/18 15:14:42 christos Exp $ */
+/* $NetBSD: docmd.c,v 1.28 2009/04/13 04:35:36 lukem Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)docmd.c 8.1 (Berkeley) 6/9/93";
#else
-__RCSID("$NetBSD: docmd.c,v 1.27 2006/12/18 15:14:42 christos Exp $");
+__RCSID("$NetBSD: docmd.c,v 1.28 2009/04/13 04:35:36 lukem Exp $");
#endif
#endif /* not lint */
@@ -315,29 +315,29 @@
/*ARGSUSED*/
lostconn(int signo __unused)
{
- char buf[BUFSIZ];
+ char lcbuf[BUFSIZ];
int nr = -1;
if (remerr != -1)
if (ioctl(remerr, FIONREAD, &nr) != -1) {
- if (nr >= sizeof(buf))
- nr = sizeof(buf) - 1;
- if ((nr = read(remerr, buf, nr)) > 0) {
- buf[nr] = '\0';
- if (buf[nr - 1] == '\n')
- buf[--nr] = '\0';
+ if (nr >= (int)sizeof(lcbuf))
+ nr = sizeof(lcbuf) - 1;
+ if ((nr = read(remerr, lcbuf, nr)) > 0) {
+ lcbuf[nr] = '\0';
+ if (lcbuf[nr - 1] == '\n')
+ lcbuf[--nr] = '\0';
}
}
if (nr <= 0)
- (void) strlcpy(buf, "lost connection", sizeof(buf));
+ (void) strlcpy(lcbuf, "lost connection", sizeof(lcbuf));
if (iamremote)
cleanup(0);
if (lfp)
- dolog(lfp, "rdist: %s\n", buf);
+ dolog(lfp, "rdist: %s\n", lcbuf);
else
- error("%s\n", buf);
+ error("%s\n", lcbuf);
longjmp(env, 1);
}
Index: src/usr.bin/rdist/expand.c
diff -u src/usr.bin/rdist/expand.c:1.16 src/usr.bin/rdist/expand.c:1.17
--- src/usr.bin/rdist/expand.c:1.16 Thu Aug 7 11:15:35 2003
+++ src/usr.bin/rdist/expand.c Mon Apr 13 04:35:36 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: expand.c,v 1.16 2003/08/07 11:15:35 agc Exp $ */
+/* $NetBSD: expand.c,v 1.17 2009/04/13 04:35:36 lukem Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)expand.c 8.1 (Berkeley) 6/9/93";
#else
-__RCSID("$NetBSD: expand.c,v 1.16 2003/08/07 11:15:35 agc Exp $");
+__RCSID("$NetBSD: expand.c,v 1.17 2009/04/13 04:35:36 lukem Exp $");
#endif
#endif /* not lint */
@@ -57,7 +57,7 @@
char *path;
char *pathp;
char *lastpathp;
-char *tilde; /* "~user" if not expanding tilde, else "" */
+const char *tilde; /* "~user" if not expanding tilde, else "" */
char *tpathp;
int nleft;
@@ -68,7 +68,7 @@
#define sort() qsort((char *)sortbase, &eargv[eargc] - sortbase, \
sizeof(*sortbase), argcmp), sortbase = &eargv[eargc]
-static void Cat(char *, char *);
+static void Cat(const char *, const char *);
static void addpath(int);
static int amatch(char *, char *);
static int argcmp(const void *, const void *);
@@ -151,7 +151,7 @@
char *cp, *cp1;
struct namelist *tp;
char *tail;
- char buf[BUFSIZ];
+ char expbuf[BUFSIZ];
int savec, oeargc;
extern char homedir[];
@@ -185,14 +185,14 @@
*tail = savec;
if (tp != NULL) {
for (; tp != NULL; tp = tp->n_next) {
- snprintf(buf, sizeof(buf), "%s%s%s", s,
+ snprintf(expbuf, sizeof(expbuf), "%s%s%s", s,
tp->n_name, tail);
- expstr(buf);
+ expstr(expbuf);
}
return;
}
- snprintf(buf, sizeof(buf), "%s%s", s, tail);
- expstr(buf);
+ snprintf(expbuf, sizeof(expbuf), "%s%s", s, tail);
+ expstr(expbuf);
return;
}
if ((which & ~E_VARS) == 0 || !strcmp(s, "{") || !strcmp(s, "{}")) {
@@ -206,17 +206,17 @@
tilde = "~";
cp1 = homedir;
} else {
- tilde = cp1 = buf;
+ tilde = cp1 = expbuf;
*cp1++ = '~';
do
*cp1++ = *cp++;
while (*cp && *cp != '/');
*cp1 = '\0';
- if (pw == NULL || strcmp(pw->pw_name, buf+1) != 0) {
- if ((pw = getpwnam(buf+1)) == NULL) {
- strlcat(buf, ": unknown user name",
- sizeof(buf));
- yyerror(buf+1);
+ if (pw == NULL || strcmp(pw->pw_name, expbuf+1) != 0) {
+ if ((pw = getpwnam(expbuf+1)) == NULL) {
+ strlcat(expbuf, ": unknown user name",
+ sizeof(expbuf));
+ yyerror(expbuf+1);
return;
}
}
@@ -251,7 +251,7 @@
argcmp(const void *a1, const void *a2)
{
- return (strcmp(*(char **)a1, *(char **)a2));
+ return (strcmp(*(const char * const *)a1, *(const char * const *)a2));
}
/*
@@ -579,7 +579,7 @@
}
static void
-Cat(char *s1, char *s2)
+Cat(const char *s1, const char *s2)
{
int len = strlen(s1) + strlen(s2) + 1;
char *s;
@@ -616,14 +616,14 @@
* part corresponding to `file'.
*/
char *
-exptilde(char *buf, char *file)
+exptilde(char *expbuf, char *file)
{
char *s1, *s2, *s3;
extern char homedir[];
if (*file != '~') {
- strcpy(buf, file);
- return(buf);
+ strcpy(expbuf, file);
+ return(expbuf);
}
if (*++file == '\0') {
s2 = homedir;
@@ -651,7 +651,7 @@
*s3 = '/';
s2 = pw->pw_dir;
}
- for (s1 = buf; (*s1++ = *s2++) != 0; )
+ for (s1 = expbuf; (*s1++ = *s2++) != 0; )
;
s2 = --s1;
if (s3 != NULL) {
Index: src/usr.bin/rdist/gram.y
diff -u src/usr.bin/rdist/gram.y:1.12 src/usr.bin/rdist/gram.y:1.13
--- src/usr.bin/rdist/gram.y:1.12 Sat Mar 18 09:46:35 2006
+++ src/usr.bin/rdist/gram.y Mon Apr 13 04:35:36 2009
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: gram.y,v 1.12 2006/03/18 09:46:35 christos Exp $ */
+/* $NetBSD: gram.y,v 1.13 2009/04/13 04:35:36 lukem Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -35,7 +35,7 @@
#if 0
static char sccsid[] = "@(#)gram.y 8.1 (Berkeley) 6/9/93";
#else
-__RCSID("$NetBSD: gram.y,v 1.12 2006/03/18 09:46:35 christos Exp $");
+__RCSID("$NetBSD: gram.y,v 1.13 2009/04/13 04:35:36 lukem Exp $");
#endif
#endif /* not lint */
@@ -353,7 +353,7 @@
}
int
-any(int c, char *str)
+any(int c, const char *str)
{
while (*str)
if (c == *str++)
@@ -440,7 +440,7 @@
* Error printing routine in parser.
*/
void
-yyerror(char *s)
+yyerror(const char *s)
{
++nerrs;
Index: src/usr.bin/rdist/lookup.c
diff -u src/usr.bin/rdist/lookup.c:1.8 src/usr.bin/rdist/lookup.c:1.9
--- src/usr.bin/rdist/lookup.c:1.8 Thu Aug 7 11:15:36 2003
+++ src/usr.bin/rdist/lookup.c Mon Apr 13 04:35:36 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: lookup.c,v 1.8 2003/08/07 11:15:36 agc Exp $ */
+/* $NetBSD: lookup.c,v 1.9 2009/04/13 04:35:36 lukem Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)lookup.c 8.1 (Berkeley) 6/9/93";
#else
-__RCSID("$NetBSD: lookup.c,v 1.8 2003/08/07 11:15:36 agc Exp $");
+__RCSID("$NetBSD: lookup.c,v 1.9 2009/04/13 04:35:36 lukem Exp $");
#endif
#endif /* not lint */
@@ -127,7 +127,7 @@
unsigned n;
char *cp;
struct syment *s;
- char buf[256];
+ char lbuf[256];
if (debug)
printf("lookup(%s, %d, %lx)\n", name, action, (long)value);
@@ -142,17 +142,17 @@
continue;
if (action != LOOKUP) {
if (action != INSERT || s->s_type != CONST) {
- (void)snprintf(buf, sizeof(buf),
+ (void)snprintf(lbuf, sizeof(lbuf),
"%s redefined", name);
- yyerror(buf);
+ yyerror(lbuf);
}
}
return(s->s_value);
}
if (action == LOOKUP) {
- (void)snprintf(buf, sizeof(buf), "%s undefined", name);
- yyerror(buf);
+ (void)snprintf(lbuf, sizeof(lbuf), "%s undefined", name);
+ yyerror(lbuf);
return(NULL);
}
Index: src/usr.bin/rdist/server.c
diff -u src/usr.bin/rdist/server.c:1.30 src/usr.bin/rdist/server.c:1.31
--- src/usr.bin/rdist/server.c:1.30 Mon Dec 18 15:14:42 2006
+++ src/usr.bin/rdist/server.c Mon Apr 13 04:35:36 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: server.c,v 1.30 2006/12/18 15:14:42 christos Exp $ */
+/* $NetBSD: server.c,v 1.31 2009/04/13 04:35:36 lukem Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)server.c 8.1 (Berkeley) 6/9/93";
#else
-__RCSID("$NetBSD: server.c,v 1.30 2006/12/18 15:14:42 christos Exp $");
+__RCSID("$NetBSD: server.c,v 1.31 2009/04/13 04:35:36 lukem Exp $");
#endif
#endif /* not lint */
@@ -564,12 +564,12 @@
}
static struct linkbuf *
-savelink(struct stat *stp)
+savelink(struct stat *st)
{
struct linkbuf *lp;
for (lp = ihead; lp != NULL; lp = lp->nextp)
- if (lp->inum == stp->st_ino && lp->devnum == stp->st_dev) {
+ if (lp->inum == st->st_ino && lp->devnum == st->st_dev) {
lp->count--;
return(lp);
}
@@ -579,9 +579,9 @@
else {
lp->nextp = ihead;
ihead = lp;
- lp->inum = stp->st_ino;
- lp->devnum = stp->st_dev;
- lp->count = stp->st_nlink - 1;
+ lp->inum = st->st_ino;
+ lp->devnum = st->st_dev;
+ lp->count = st->st_nlink - 1;
if (Destcopy) {
/*
* Change the starting directory of target
@@ -605,14 +605,14 @@
* and 3 if comparing binaries to determine if out of date.
*/
static int
-update(char *rname, int opts, struct stat *stp)
+update(char *rname, int opts, struct stat *st)
{
char *cp, *s;
off_t size;
time_t mtime;
if (debug)
- printf("update(%s, %lx, %lx)\n", rname, (long)opts, (long)stp);
+ printf("update(%s, %lx, %lx)\n", rname, (long)opts, (long)st);
/*
* Check to see if the file exists on the remote machine.
@@ -684,14 +684,14 @@
* File needs to be updated?
*/
if (opts & YOUNGER) {
- if (stp->st_mtime == mtime)
+ if (st->st_mtime == mtime)
return(0);
- if (stp->st_mtime < mtime) {
+ if (st->st_mtime < mtime) {
dolog(lfp, "Warning: %s: remote copy is newer\n",
target);
return(0);
}
- } else if (stp->st_mtime == mtime && stp->st_size == size)
+ } else if (st->st_mtime == mtime && st->st_size == size)
return(0);
return(2);
}
@@ -802,7 +802,7 @@
*cp++ = '\0';
if (type == S_IFDIR) {
- if (catname >= sizeof(stp)) {
+ if (catname >= (int)sizeof(stp)) {
error("%s:%s: too many directory levels\n",
host, target);
return;
@@ -1296,7 +1296,7 @@
* or an error message.
*/
static void
-removeit(struct stat *stp)
+removeit(struct stat *st)
{
DIR *d;
struct dirent *dp;
@@ -1305,7 +1305,7 @@
char *otp;
int len;
- switch (stp->st_mode & S_IFMT) {
+ switch (st->st_mode & S_IFMT) {
case S_IFREG:
case S_IFLNK:
if (unlink(target) < 0)
@@ -1575,13 +1575,13 @@
static void
note(const char *fmt, ...)
{
- static char buf[BUFSIZ];
+ static char nbuf[BUFSIZ];
va_list ap;
va_start(ap, fmt);
- (void)vsnprintf(buf, sizeof(buf), fmt, ap);
+ (void)vsnprintf(nbuf, sizeof(nbuf), fmt, ap);
va_end(ap);
- comment(buf);
+ comment(nbuf);
}
static void
