As of sam's r175206, arp builds cleanly at WARNS level 6, but the Makefile

was never updated.  Also, clean up the macro that caused the warning in the
first place (no functional changes, just wrapped and reindented).
This commit is contained in:
Dag-Erling Smørgrav 2009-06-11 07:50:36 +00:00
parent d77148fbca
commit be5d11dcb0
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=193976
2 changed files with 8 additions and 4 deletions

View File

@ -4,6 +4,6 @@
PROG= arp
MAN= arp.4 arp.8
WARNS?= 1
WARNS?= 6
.include <bsd.prog.mk>

View File

@ -721,9 +721,13 @@ rtmsg(int cmd, struct sockaddr_inarp *dst, struct sockaddr_dl *sdl)
case RTM_GET:
rtm->rtm_addrs |= RTA_DST;
}
#define NEXTADDR(w, s) \
if ((s) != NULL && rtm->rtm_addrs & (w)) { \
bcopy((s), cp, sizeof(*(s))); cp += SA_SIZE(s);}
#define NEXTADDR(w, s) \
do { \
if ((s) != NULL && rtm->rtm_addrs & (w)) { \
bcopy((s), cp, sizeof(*(s))); \
cp += SA_SIZE(s); \
} \
} while (0)
NEXTADDR(RTA_DST, dst);
NEXTADDR(RTA_GATEWAY, sdl);