diff options
| author | dim <dim@FreeBSD.org> | 2010-12-09 22:01:15 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2010-12-09 22:01:15 +0000 |
| commit | a3786f65f1e2fa3a4e925fdb4b2b5544b9021bf9 (patch) | |
| tree | 5f0a24f71baa3176c75a20a51a9e20a22c75426c /contrib/traceroute/ifaddrlist.c | |
| parent | ad01c620333d05c430d583ee40647e396be1ab91 (diff) | |
| parent | 12dd9eb8e940c48f9fc30dbc137071b4fe5caead (diff) | |
| download | FreeBSD-src-a3786f65f1e2fa3a4e925fdb4b2b5544b9021bf9.zip FreeBSD-src-a3786f65f1e2fa3a4e925fdb4b2b5544b9021bf9.tar.gz | |
Sync: merge r216133 through r216338 from ^/head.
Diffstat (limited to 'contrib/traceroute/ifaddrlist.c')
| -rw-r--r-- | contrib/traceroute/ifaddrlist.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/traceroute/ifaddrlist.c b/contrib/traceroute/ifaddrlist.c index 99c5fc1..b1d41d3 100644 --- a/contrib/traceroute/ifaddrlist.c +++ b/contrib/traceroute/ifaddrlist.c @@ -71,14 +71,14 @@ ifaddrlist(register struct ifaddrlist **ipaddrp, register char *errbuf) { register int fd, nipaddr; #ifdef HAVE_SOCKADDR_SA_LEN - register int n; + size_t n; #endif register struct ifreq *ifrp, *ifend, *ifnext, *mp; register struct sockaddr_in *sin; register struct ifaddrlist *al; struct ifconf ifc; struct ifreq ibuf[(32 * 1024) / sizeof(struct ifreq)], ifr; -#define MAX_IPADDR (sizeof(ibuf) / sizeof(ibuf[0])) +#define MAX_IPADDR ((int)(sizeof(ibuf) / sizeof(ibuf[0]))) static struct ifaddrlist ifaddrlist[MAX_IPADDR]; char device[sizeof(ifr.ifr_name) + 1]; @@ -91,10 +91,10 @@ ifaddrlist(register struct ifaddrlist **ipaddrp, register char *errbuf) ifc.ifc_buf = (caddr_t)ibuf; if (ioctl(fd, SIOCGIFCONF, (char *)&ifc) < 0 || - ifc.ifc_len < sizeof(struct ifreq)) { + ifc.ifc_len < (int)sizeof(struct ifreq)) { if (errno == EINVAL) (void)sprintf(errbuf, - "SIOCGIFCONF: ifreq struct too small (%d bytes)", + "SIOCGIFCONF: ifreq struct too small (%zu bytes)", sizeof(ibuf)); else (void)sprintf(errbuf, "SIOCGIFCONF: %s", |
