From f6293d72969cec8d9fa7cceab0e26b27d86dcc3d Mon Sep 17 00:00:00 2001 From: Brooks Davis Date: Thu, 5 Jul 2018 17:02:10 +0000 Subject: [PATCH] Work around lame warnings in ancient gcc on 32-bit platforms. Fixes r335979. --- usr.bin/netstat/inet.c | 4 ++-- usr.bin/netstat/unix.c | 2 +- usr.sbin/tcpdrop/tcpdrop.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c index 5d379dcfa577..96ab6bc562c4 100644 --- a/usr.bin/netstat/inet.c +++ b/usr.bin/netstat/inet.c @@ -159,12 +159,12 @@ sotoxsocket(struct socket *so, struct xsocket *xso) bzero(xso, sizeof *xso); xso->xso_len = sizeof *xso; - xso->xso_so = (kvaddr_t)so; + xso->xso_so = (kvaddr_t)(long)so; xso->so_type = so->so_type; xso->so_options = so->so_options; xso->so_linger = so->so_linger; xso->so_state = so->so_state; - xso->so_pcb = (kvaddr_t)so->so_pcb; + xso->so_pcb = (kvaddr_t)(long)so->so_pcb; if (kread((uintptr_t)so->so_proto, &proto, sizeof(proto)) != 0) return (-1); xso->xso_protocol = proto.pr_protocol; diff --git a/usr.bin/netstat/unix.c b/usr.bin/netstat/unix.c index e0eeca0d9c6a..1acdd0143f69 100644 --- a/usr.bin/netstat/unix.c +++ b/usr.bin/netstat/unix.c @@ -153,7 +153,7 @@ pcblist_kvm(u_long count_off, u_long gencnt_off, u_long head_off, char **bufp) xu.xu_len = sizeof xu; KREAD(head_off, &head, sizeof(head)); LIST_FOREACH(unp, &head, unp_link) { - xu.xu_unpp = (kvaddr_t)unp; + xu.xu_unpp = (kvaddr_t)(long)unp; KREAD(unp, &unp0, sizeof (*unp)); unp = &unp0; diff --git a/usr.sbin/tcpdrop/tcpdrop.c b/usr.sbin/tcpdrop/tcpdrop.c index 6098a73ac3c0..1d75b15e0bbf 100644 --- a/usr.sbin/tcpdrop/tcpdrop.c +++ b/usr.sbin/tcpdrop/tcpdrop.c @@ -235,7 +235,7 @@ tcpdropall(const char *stack, int state) head = getxpcblist("net.inet.tcp.pcblist"); #define XINP_NEXT(xinp) \ - ((struct xinpgen *)((uintptr_t)(xinp) + (xinp)->xig_len)) + ((struct xinpgen *)(long)((uintptr_t)(xinp) + (xinp)->xig_len)) for (xinp = XINP_NEXT(head); xinp->xig_len > sizeof *xinp; xinp = XINP_NEXT(xinp)) {