Module Name: src
Committed By: lukem
Date: Sat Apr 18 08:50:23 UTC 2009
Modified Files:
src/usr.sbin/rarpd: mkarp.c rarpd.c
Log Message:
Fix WARNS=4 issues (-Wshadow -Wsign-compare -Wextra)
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/rarpd/mkarp.c
cvs rdiff -u -r1.57 -r1.58 src/usr.sbin/rarpd/rarpd.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/rarpd/mkarp.c
diff -u src/usr.sbin/rarpd/mkarp.c:1.7 src/usr.sbin/rarpd/mkarp.c:1.8
--- src/usr.sbin/rarpd/mkarp.c:1.7 Mon Jul 21 13:36:59 2008
+++ src/usr.sbin/rarpd/mkarp.c Sat Apr 18 08:50:23 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mkarp.c,v 1.7 2008/07/21 13:36:59 lukem Exp $ */
+/* $NetBSD: mkarp.c,v 1.8 2009/04/18 08:50:23 lukem Exp $ */
/*
* Copyright (c) 1984, 1993
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)arp.c 8.3 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: mkarp.c,v 1.7 2008/07/21 13:36:59 lukem Exp $");
+__RCSID("$NetBSD: mkarp.c,v 1.8 2009/04/18 08:50:23 lukem Exp $");
#endif
#endif /* not lint */
@@ -93,8 +93,10 @@
int
mkarp(u_char *haddr, u_int32_t ipaddr)
{
- static struct sockaddr_inarp blank_sin = {sizeof(blank_sin), AF_INET };
- static struct sockaddr_dl blank_sdl = {sizeof(blank_sdl), AF_LINK };
+ static struct sockaddr_inarp blank_sin = {
+ sizeof(blank_sin), AF_INET, 0, { 0 }, { 0 }, 0, 0 };
+ static struct sockaddr_dl blank_sdl = {
+ sizeof(blank_sdl), AF_LINK, 0, 0, 0, 0, 0, { 0 } };
struct sockaddr_inarp *sin;
struct sockaddr_dl *sdl;
@@ -183,7 +185,7 @@
char *cp;
int l;
pid_t pid;
- struct timeval time;
+ struct timeval tv;
rtm = &m_rtmsg.m_rtm;
cp = m_rtmsg.m_space;
@@ -200,8 +202,8 @@
/*NOTREACHED*/
case RTM_ADD:
rtm->rtm_addrs |= RTA_GATEWAY;
- (void)gettimeofday(&time, 0);
- rtm->rtm_rmx.rmx_expire = time.tv_sec + 20 * 60;
+ (void)gettimeofday(&tv, 0);
+ rtm->rtm_rmx.rmx_expire = tv.tv_sec + 20 * 60;
rtm->rtm_inits = RTV_EXPIRE;
rtm->rtm_flags |= (RTF_HOST | RTF_STATIC);
sin_m->sin_other = 0;
Index: src/usr.sbin/rarpd/rarpd.c
diff -u src/usr.sbin/rarpd/rarpd.c:1.57 src/usr.sbin/rarpd/rarpd.c:1.58
--- src/usr.sbin/rarpd/rarpd.c:1.57 Mon Jul 21 13:36:59 2008
+++ src/usr.sbin/rarpd/rarpd.c Sat Apr 18 08:50:23 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rarpd.c,v 1.57 2008/07/21 13:36:59 lukem Exp $ */
+/* $NetBSD: rarpd.c,v 1.58 2009/04/18 08:50:23 lukem Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -25,7 +25,7 @@
#endif /* not lint */
#ifndef lint
-__RCSID("$NetBSD: rarpd.c,v 1.57 2008/07/21 13:36:59 lukem Exp $");
+__RCSID("$NetBSD: rarpd.c,v 1.58 2009/04/18 08:50:23 lukem Exp $");
#endif
@@ -375,13 +375,13 @@
struct ether_arp *ap = (struct ether_arp *) (p + sizeof(*ep));
#endif
- if (len < sizeof(*ep) + sizeof(*ap)) {
+ if (len < (int)(sizeof(*ep) + sizeof(*ap))) {
rarperr(NONFATAL, "truncated request");
return 0;
}
#ifdef __NetBSD__
/* now that we know the fixed part of the ARP hdr is there: */
- if (len < sizeof(*ap) + 2 * ap->ar_hln + 2 * ap->ar_pln) {
+ if (len < (int)(sizeof(*ap) + 2 * ap->ar_hln + 2 * ap->ar_pln)) {
rarperr(NONFATAL, "truncated request");
return 0;
}
