diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2014-04-21 11:10:55 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2014-04-21 11:10:55 +0000 |
| commit | 72db62ba641f18218b24986c24fed35a87c901f3 (patch) | |
| tree | 81c7576fe1ff945724800630ba86c40f97602b83 /sys/netinet/ip_mroute.c | |
| parent | a7646c72d921d269b3b42c1b9cc50aec5263af76 (diff) | |
we'll do fine without casting NULL to struct foo * / void *
ok gcc & md5 (alas, no binary change)
Diffstat (limited to 'sys/netinet/ip_mroute.c')
| -rw-r--r-- | sys/netinet/ip_mroute.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c index 7134a397842..2e4a30a3d15 100644 --- a/sys/netinet/ip_mroute.c +++ b/sys/netinet/ip_mroute.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_mroute.c,v 1.64 2014/01/09 06:29:06 tedu Exp $ */ +/* $OpenBSD: ip_mroute.c,v 1.65 2014/04/21 11:10:54 henning Exp $ */ /* $NetBSD: ip_mroute.c,v 1.85 2004/04/26 01:31:57 matt Exp $ */ /* @@ -1225,8 +1225,7 @@ static int socket_send(struct socket *s, struct mbuf *mm, struct sockaddr_in *src) { if (s != NULL) { - if (sbappendaddr(&s->so_rcv, sintosa(src), mm, - (struct mbuf *)NULL) != 0) { + if (sbappendaddr(&s->so_rcv, sintosa(src), mm, NULL) != 0) { sorwakeup(s); return (0); } @@ -1733,9 +1732,7 @@ send_packet(struct vif *vifp, struct mbuf *m) if (vifp->v_flags & VIFF_TUNNEL) { /* If tunnel options */ - ip_output(m, (struct mbuf *)NULL, &vifp->v_route, - IP_FORWARDING, (struct ip_moptions *)NULL, - (struct inpcb *)NULL); + ip_output(m, NULL, &vifp->v_route, IP_FORWARDING, NULL, NULL); } else { /* * if physical interface option, extract the options @@ -1747,9 +1744,8 @@ send_packet(struct vif *vifp, struct mbuf *m) imo.imo_multicast_ttl = mtod(m, struct ip *)->ip_ttl - IPTTLDEC; imo.imo_multicast_loop = 1; - error = ip_output(m, (struct mbuf *)NULL, (struct route *)NULL, - IP_FORWARDING|IP_MULTICASTOPTS, &imo, - (struct inpcb *)NULL); + error = ip_output(m, NULL, NULL, + IP_FORWARDING | IP_MULTICASTOPTS, &imo, NULL); if (mrtdebug & DEBUG_XMIT) log(LOG_DEBUG, "phyint_send on vif %ld err %d\n", @@ -2762,8 +2758,7 @@ pim_input(struct mbuf *m, ...) reg_vif_num); } /* NB: vifp was collected above; can it change on us? */ - looutput(vifp, m, (struct sockaddr *)&dst, - (struct rtentry *)NULL); + looutput(vifp, m, (struct sockaddr *)&dst, NULL); /* prepare the register head to send to the mrouting daemon */ m = mcp; |