Module Name: src
Committed By: lukem
Date: Fri Apr 17 16:05:43 UTC 2009
Modified Files:
src/usr.sbin/mrouted: cfparse.y igmp.c prune.c route.c
Log Message:
Fix WARNS=4 (-Wshadow -Wsign-compare -Wcast-qual)
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/mrouted/cfparse.y
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/mrouted/igmp.c
cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/mrouted/prune.c
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/mrouted/route.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.sbin/mrouted/cfparse.y
diff -u src/usr.sbin/mrouted/cfparse.y:1.15 src/usr.sbin/mrouted/cfparse.y:1.16
--- src/usr.sbin/mrouted/cfparse.y:1.15 Mon Aug 18 05:39:53 2003
+++ src/usr.sbin/mrouted/cfparse.y Fri Apr 17 16:05:43 2009
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cfparse.y,v 1.15 2003/08/18 05:39:53 itojun Exp $ */
+/* $NetBSD: cfparse.y,v 1.16 2009/04/17 16:05:43 lukem Exp $ */
/*
* Configuration file parser for mrouted.
@@ -31,11 +31,11 @@
/*
* Local function declarations
*/
-static void fatal(char *fmt, ...)
+static void fatal(const char *fmt, ...)
__attribute__((__format__(__printf__, 1, 2)));
-static void warn(char *fmt, ...)
+static void warn(const char *fmt, ...)
__attribute__((__format__(__printf__, 1, 2)));
-static void yyerror(char *s);
+static void yyerror(const char *s);
static char * next_word(void);
static int yylex(void);
static u_int32_t valid_if(char *s);
@@ -44,7 +44,7 @@
static FILE *f __attribute__((__unused__)); /* XXX egcs */
extern int udp_socket;
-char *configfilename = _PATH_MROUTED_CONF;
+const char *configfilename = _PATH_MROUTED_CONF;
extern int cache_lifetime;
extern int max_prune_lifetime;
@@ -390,7 +390,7 @@
;
%%
static void
-fatal(char *fmt, ...)
+fatal(const char *fmt, ...)
{
va_list ap;
char buf[200];
@@ -403,7 +403,7 @@
}
static void
-warn(char *fmt, ...)
+warn(const char *fmt, ...)
{
va_list ap;
char buf[200];
@@ -417,7 +417,7 @@
static void
yyerror(s)
-char *s;
+const char *s;
{
logit(LOG_ERR, 0, "%s: %s near line %d", configfilename, s, lineno);
}
@@ -577,11 +577,11 @@
char *s;
{
vifi_t vifi;
- struct uvif *v;
+ struct uvif *uv;
- for (vifi=0, v=uvifs; vifi<numvifs; vifi++, v++)
- if (!strcmp(v->uv_name, s))
- return v->uv_lcl_addr;
+ for (vifi=0, uv=uvifs; vifi<numvifs; vifi++, uv++)
+ if (!strcmp(uv->uv_name, s))
+ return uv->uv_lcl_addr;
return 0;
}
Index: src/usr.sbin/mrouted/igmp.c
diff -u src/usr.sbin/mrouted/igmp.c:1.13 src/usr.sbin/mrouted/igmp.c:1.14
--- src/usr.sbin/mrouted/igmp.c:1.13 Thu May 11 21:17:02 2006
+++ src/usr.sbin/mrouted/igmp.c Fri Apr 17 16:05:43 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: igmp.c,v 1.13 2006/05/11 21:17:02 mrg Exp $ */
+/* $NetBSD: igmp.c,v 1.14 2009/04/17 16:05:43 lukem Exp $ */
/*
* The mrouted program is covered by the license in the accompanying file
@@ -29,7 +29,7 @@
* Local function definitions.
*/
/* u_char promoted to u_int */
-static char * packet_kind(u_int type, u_int code);
+static const char * packet_kind(u_int type, u_int code);
static int igmp_log_level(u_int type, u_int code);
/*
@@ -75,7 +75,7 @@
#define PIM_GRAFT 6
#define PIM_GRAFT_ACK 7
-static char *
+static const char *
packet_kind(u_int type, u_int code)
{
switch (type) {
@@ -128,7 +128,7 @@
struct igmp *igmp;
int ipdatalen, iphdrlen, igmpdatalen;
- if (recvlen < sizeof(struct ip)) {
+ if (recvlen < (int)sizeof(struct ip)) {
logit(LOG_WARNING, 0,
"received packet too short (%u bytes) for IP header", recvlen);
return;
Index: src/usr.sbin/mrouted/prune.c
diff -u src/usr.sbin/mrouted/prune.c:1.17 src/usr.sbin/mrouted/prune.c:1.18
--- src/usr.sbin/mrouted/prune.c:1.17 Thu May 25 01:41:13 2006
+++ src/usr.sbin/mrouted/prune.c Fri Apr 17 16:05:43 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: prune.c,v 1.17 2006/05/25 01:41:13 christos Exp $ */
+/* $NetBSD: prune.c,v 1.18 2009/04/17 16:05:43 lukem Exp $ */
/*
* The mrouted program is covered by the license in the accompanying file
@@ -56,7 +56,7 @@
static void send_graft_ack(u_int32_t src, u_int32_t dst,
u_int32_t origin, u_int32_t grp);
static void update_kernel(struct gtable *g);
-static char * scaletime(u_long t);
+static const char * scaletime(u_long t);
/*
* Updates the ttl values for each vif.
@@ -1211,7 +1211,7 @@
/* Refresh the group's lifetime */
g->gt_timer = CACHE_LIFETIME(cache_lifetime);
- if (g->gt_timer < prun_tmr)
+ if ((u_int32_t)g->gt_timer < prun_tmr)
g->gt_timer = prun_tmr;
/*
@@ -1834,7 +1834,7 @@
}
-static char *
+static const char *
scaletime(u_long t)
{
static char buf1[5];
@@ -1994,7 +1994,7 @@
/*
* if it is a packet with all reports filled, drop it
*/
- if ((rcount = (datalen - QLEN)/RLEN) == no) {
+ if ((u_int)(rcount = (datalen - QLEN)/RLEN) == no) {
logit(LOG_DEBUG, 0, "packet with all reports filled in");
return;
}
@@ -2201,7 +2201,7 @@
*/
logit(LOG_DEBUG, 0, "rcount:%d, no:%d", rcount, no);
- if ((rcount + 1 == no) || (rt == NULL) || (rt->rt_metric == 1)) {
+ if (((u_int)(rcount + 1) == no) || (rt == NULL) || (rt->rt_metric == 1)) {
resptype = IGMP_MTRACE_REPLY;
dst = qry->tr_raddr;
} else
Index: src/usr.sbin/mrouted/route.c
diff -u src/usr.sbin/mrouted/route.c:1.12 src/usr.sbin/mrouted/route.c:1.13
--- src/usr.sbin/mrouted/route.c:1.12 Thu May 25 01:44:28 2006
+++ src/usr.sbin/mrouted/route.c Fri Apr 17 16:05:43 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: route.c,v 1.12 2006/05/25 01:44:28 christos Exp $ */
+/* $NetBSD: route.c,v 1.13 2009/04/17 16:05:43 lukem Exp $ */
/*
* The mrouted program is covered by the license in the accompanying file
@@ -707,8 +707,8 @@
static int
compare_rts(const void *rt1, const void *rt2)
{
- struct newrt *r1 = (struct newrt *)rt1;
- struct newrt *r2 = (struct newrt *)rt2;
+ const struct newrt *r1 = (const struct newrt *)rt1;
+ const struct newrt *r2 = (const struct newrt *)rt2;
u_int32_t m1 = ntohl(r1->mask);
u_int32_t m2 = ntohl(r2->mask);
u_int32_t o1, o2;
