From 1ede983cc905643549d8cae56a9d0e28fc68375f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= Date: Thu, 23 Oct 2008 15:53:51 +0000 Subject: Retire the MALLOC and FREE macros. They are an abomination unto style(9). MFC after: 3 months --- sys/netinet6/raw_ip6.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'sys/netinet6/raw_ip6.c') diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c index 4fafdb124a8a..8b99b08236a9 100644 --- a/sys/netinet6/raw_ip6.c +++ b/sys/netinet6/raw_ip6.c @@ -565,15 +565,14 @@ rip6_attach(struct socket *so, int proto, struct thread *td) error = soreserve(so, rip_sendspace, rip_recvspace); if (error) return (error); - MALLOC(filter, struct icmp6_filter *, - sizeof(struct icmp6_filter), M_PCB, M_NOWAIT); + filter = malloc( sizeof(struct icmp6_filter), M_PCB, M_NOWAIT); if (filter == NULL) return (ENOMEM); INP_INFO_WLOCK(&V_ripcbinfo); error = in_pcballoc(so, &V_ripcbinfo); if (error) { INP_INFO_WUNLOCK(&V_ripcbinfo); - FREE(filter, M_PCB); + free(filter, M_PCB); return (error); } inp = (struct inpcb *)so->so_pcb; @@ -602,7 +601,7 @@ rip6_detach(struct socket *so) /* xxx: RSVP */ INP_INFO_WLOCK(&V_ripcbinfo); INP_WLOCK(inp); - FREE(inp->in6p_icmp6filt, M_PCB); + free(inp->in6p_icmp6filt, M_PCB); in6_pcbdetach(inp); in6_pcbfree(inp); INP_INFO_WUNLOCK(&V_ripcbinfo); -- cgit v1.2.3