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/netgraph/ng_l2tp.c | |
| 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/netgraph/ng_l2tp.c')
| -rw-r--r-- | sys/netgraph/ng_l2tp.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/netgraph/ng_l2tp.c b/sys/netgraph/ng_l2tp.c index f035bea..46a817c 100644 --- a/sys/netgraph/ng_l2tp.c +++ b/sys/netgraph/ng_l2tp.c @@ -364,7 +364,7 @@ ng_l2tp_constructor(node_p node) int i; /* Allocate private structure */ - MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH_L2TP, M_NOWAIT | M_ZERO); + priv = malloc(sizeof(*priv), M_NETGRAPH_L2TP, M_NOWAIT | M_ZERO); if (priv == NULL) return (ENOMEM); NG_NODE_SET_PRIVATE(node, priv); @@ -428,8 +428,7 @@ ng_l2tp_newhook(node_p node, hook_p hook, const char *name) return (EINVAL); /* Create hook private structure */ - MALLOC(hpriv, hookpriv_p, - sizeof(*hpriv), M_NETGRAPH_L2TP, M_NOWAIT | M_ZERO); + hpriv = malloc( sizeof(*hpriv), M_NETGRAPH_L2TP, M_NOWAIT | M_ZERO); if (hpriv == NULL) return (ENOMEM); hpriv->conf.session_id = session_id; @@ -667,7 +666,7 @@ ng_l2tp_shutdown(node_p node) mtx_destroy(&seq->mtx); - FREE(priv, M_NETGRAPH_L2TP); + free(priv, M_NETGRAPH_L2TP); /* Unref node */ NG_NODE_UNREF(node); @@ -691,7 +690,7 @@ ng_l2tp_disconnect(hook_p hook) else { const hookpriv_p hpriv = NG_HOOK_PRIVATE(hook); LIST_REMOVE(hpriv, sessions); - FREE(hpriv, M_NETGRAPH_L2TP); + free(hpriv, M_NETGRAPH_L2TP); NG_HOOK_SET_PRIVATE(hook, NULL); } |
