diff options
| author | des <des@FreeBSD.org> | 2008-10-23 15:53:51 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2008-10-23 15:53:51 +0000 |
| commit | 66f807ed8b3634dc73d9f7526c484e43f094c0ee (patch) | |
| tree | 21e792ce590e1bcf9b343890605a1b4c6a9016b3 /sys/netipx | |
| parent | a779c60ce0a41cd14710a8a12cfa22955108b27a (diff) | |
| download | FreeBSD-src-66f807ed8b3634dc73d9f7526c484e43f094c0ee.zip FreeBSD-src-66f807ed8b3634dc73d9f7526c484e43f094c0ee.tar.gz | |
Retire the MALLOC and FREE macros. They are an abomination unto style(9).
MFC after: 3 months
Diffstat (limited to 'sys/netipx')
| -rw-r--r-- | sys/netipx/ipx_pcb.c | 4 | ||||
| -rw-r--r-- | sys/netipx/spx_usrreq.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/netipx/ipx_pcb.c b/sys/netipx/ipx_pcb.c index 36c1354..a478c08 100644 --- a/sys/netipx/ipx_pcb.c +++ b/sys/netipx/ipx_pcb.c @@ -91,7 +91,7 @@ ipx_pcballoc(struct socket *so, struct ipxpcbhead *head, struct thread *td) KASSERT(so->so_pcb == NULL, ("ipx_pcballoc: so_pcb != NULL")); IPX_LIST_LOCK_ASSERT(); - MALLOC(ipxp, struct ipxpcb *, sizeof *ipxp, M_PCB, M_NOWAIT | M_ZERO); + ipxp = malloc(sizeof *ipxp, M_PCB, M_NOWAIT | M_ZERO); if (ipxp == NULL) return (ENOBUFS); IPX_LOCK_INIT(ipxp); @@ -317,7 +317,7 @@ ipx_pcbfree(struct ipxpcb *ipxp) RTFREE(ipxp->ipxp_route.ro_rt); LIST_REMOVE(ipxp, ipxp_list); IPX_LOCK_DESTROY(ipxp); - FREE(ipxp, M_PCB); + free(ipxp, M_PCB); } void diff --git a/sys/netipx/spx_usrreq.c b/sys/netipx/spx_usrreq.c index b826ee8..86882cb 100644 --- a/sys/netipx/spx_usrreq.c +++ b/sys/netipx/spx_usrreq.c @@ -1397,12 +1397,12 @@ spx_attach(struct socket *so, int proto, struct thread *td) return (error); } - MALLOC(cb, struct spxpcb *, sizeof *cb, M_PCB, M_NOWAIT | M_ZERO); + cb = malloc(sizeof *cb, M_PCB, M_NOWAIT | M_ZERO); if (cb == NULL) return (ENOBUFS); mm = m_getclr(M_DONTWAIT, MT_DATA); if (mm == NULL) { - FREE(cb, M_PCB); + free(cb, M_PCB); return (ENOBUFS); } @@ -1411,7 +1411,7 @@ spx_attach(struct socket *so, int proto, struct thread *td) if (error) { IPX_LIST_UNLOCK(); m_free(mm); - FREE(cb, M_PCB); + free(cb, M_PCB); return (error); } ipxp = sotoipxpcb(so); @@ -1463,7 +1463,7 @@ spx_pcbdetach(struct ipxpcb *ipxp) m_freem(m); } m_free(dtom(cb->s_ipx)); - FREE(cb, M_PCB); + free(cb, M_PCB); ipxp->ipxp_pcb = NULL; } |
