Date: Mon, 3 May 2010 14:25:05 GMT From: Gabor Pali <pgj@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 177651 for review Message-ID: <201005031425.o43EP5ZF022677@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@177651?ac=10 Change 177651 by pgj@csupor on 2010/05/03 14:24:30 Fix build problems. Affected files ... .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_mbuf.c#4 edit .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_route.c#7 edit Differences ... ==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_mbuf.c#4 (text+ko) ==== @@ -69,7 +69,8 @@ struct mbstat_data mbsd; struct mbstat mbstat; - int error, result, i, len, bucket; + int error, result, i, bucket; + size_t len; const char *sfstats_mib = "kern.ipc.sfbstats"; const char *mbstats_mib = "kern.ipc.mbstats"; ==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_route.c#7 (text+ko) ==== @@ -42,10 +42,13 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <strings.h> #include "netstat.h" #include "netstat_internal.h" +#define PTR2INT(i,p) bcopy(&(p), &(i), MIN(sizeof(p), sizeof(i))) + /* nlist(3) indices and symbols */ enum nlRT { nlRT_rt_tables = 0, @@ -224,7 +227,7 @@ if (flags & NETSTAT_ROUTE_ALL) { rtp = _netstat_rt_allocate(list); rtp->rt_family = domain; - rtp->rt_node.rnt_address = (int)rn; + PTR2INT(rtp->rt_node.rnt_address, rn); rtp->rt_node.rnt_flags |= NETSTAT_RTN_ROOT; extract_node(rnode, &rtp->rt_node, cnt); } @@ -245,7 +248,7 @@ } rtp = _netstat_rt_allocate(list); - rtp->rt_node.rnt_address = (int)rn; + PTR2INT(rtp->rt_node.rnt_address, rn); rtp->rt_node.rnt_mask = extract_address(rnode->rn_mask, NULL, 0); extract_rtentry_data(&rtentry, rtp); @@ -257,7 +260,7 @@ if (flags & NETSTAT_ROUTE_ALL) { rtp = _netstat_rt_allocate(list); rtp->rt_family = domain; - rtp->rt_node.rnt_address = (int)rn; + PTR2INT(rtp->rt_node.rnt_address, rn); extract_node(rnode, &rtp->rt_node, cnt); } rn = rnode->rn_right; @@ -528,10 +531,10 @@ int i; rnp->rnt_bit = rn->rn_bit; - rnp->rnt_left = (int)rn->rn_left; - rnp->rnt_right = (int)rn->rn_right; - rnp->rnt_key = (int)rn->rn_key; - rnp->rnt_dupedkey = (int)rn->rn_dupedkey; + PTR2INT(rnp->rnt_left, rn->rn_left); + PTR2INT(rnp->rnt_right, rn->rn_right); + PTR2INT(rnp->rnt_key, rn->rn_key); + PTR2INT(rnp->rnt_dupedkey, rn->rn_dupedkey); if (rn->rn_dupedkey != 0) rnp->rnt_flags |= NETSTAT_RTN_DUPEDKEY; rnp->rnt_mkcnt = mkcnt;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201005031425.o43EP5ZF022677>