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/netipsec | |
| 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/netipsec')
| -rw-r--r-- | sys/netipsec/keysock.c | 2 | ||||
| -rw-r--r-- | sys/netipsec/xform_ah.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/netipsec/keysock.c b/sys/netipsec/keysock.c index 2f74261..882aed4 100644 --- a/sys/netipsec/keysock.c +++ b/sys/netipsec/keysock.c @@ -404,7 +404,7 @@ key_attach(struct socket *so, int proto, struct thread *td) } /* XXX */ - MALLOC(kp, struct keycb *, sizeof *kp, M_PCB, M_WAITOK | M_ZERO); + kp = malloc(sizeof *kp, M_PCB, M_WAITOK | M_ZERO); if (kp == 0) return ENOBUFS; diff --git a/sys/netipsec/xform_ah.c b/sys/netipsec/xform_ah.c index 76fecb1..c5b3697 100644 --- a/sys/netipsec/xform_ah.c +++ b/sys/netipsec/xform_ah.c @@ -485,7 +485,7 @@ ah_massage_headers(struct mbuf **m0, int proto, int skip, int alg, int out) /* Free, if we allocated. */ if (alloc) - FREE(ptr, M_XDATA); + free(ptr, M_XDATA); return EINVAL; } @@ -505,7 +505,7 @@ ah_massage_headers(struct mbuf **m0, int proto, int skip, int alg, int out) /* Free, if we allocated. */ if (alloc) - FREE(ptr, M_XDATA); + free(ptr, M_XDATA); return EINVAL; } } @@ -529,7 +529,7 @@ ah_massage_headers(struct mbuf **m0, int proto, int skip, int alg, int out) DPRINTF(("%s: unexpected IPv6 header type %d", __func__, off)); if (alloc) - FREE(ptr, M_XDATA); + free(ptr, M_XDATA); m_freem(m); return EINVAL; } |
