diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2008-10-23 15:53:51 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2008-10-23 15:53:51 +0000 |
| commit | 1ede983cc905643549d8cae56a9d0e28fc68375f (patch) | |
| tree | 21e792ce590e1bcf9b343890605a1b4c6a9016b3 /sys/netgraph/ng_nat.c | |
| parent | 994f9863852fe65833509090659d9f5aef7194d3 (diff) | |
| download | src-1ede983cc905643549d8cae56a9d0e28fc68375f.tar.gz src-1ede983cc905643549d8cae56a9d0e28fc68375f.zip | |
Retire the MALLOC and FREE macros. They are an abomination unto style(9).
MFC after: 3 months
Notes
Notes:
svn path=/head/; revision=184205
Diffstat (limited to 'sys/netgraph/ng_nat.c')
| -rw-r--r-- | sys/netgraph/ng_nat.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/netgraph/ng_nat.c b/sys/netgraph/ng_nat.c index 9e605daafd13..cc69b141e027 100644 --- a/sys/netgraph/ng_nat.c +++ b/sys/netgraph/ng_nat.c @@ -272,7 +272,7 @@ ng_nat_constructor(node_p node) priv_p priv; /* Initialize private descriptor. */ - MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, + priv = malloc(sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO); if (priv == NULL) return (ENOMEM); @@ -280,7 +280,7 @@ ng_nat_constructor(node_p node) /* Init aliasing engine. */ priv->lib = LibAliasInit(NULL); if (priv->lib == NULL) { - FREE(priv, M_NETGRAPH); + free(priv, M_NETGRAPH); return (ENOMEM); } @@ -408,7 +408,7 @@ ng_nat_rcvmsg(node_p node, item_p item, hook_p lasthook) if (entry->lnk == NULL) { error = ENOMEM; - FREE(entry, M_NETGRAPH); + free(entry, M_NETGRAPH); break; } @@ -464,7 +464,7 @@ ng_nat_rcvmsg(node_p node, item_p item, hook_p lasthook) if (entry->lnk == NULL) { error = ENOMEM; - FREE(entry, M_NETGRAPH); + free(entry, M_NETGRAPH); break; } @@ -517,7 +517,7 @@ ng_nat_rcvmsg(node_p node, item_p item, hook_p lasthook) if (entry->lnk == NULL) { error = ENOMEM; - FREE(entry, M_NETGRAPH); + free(entry, M_NETGRAPH); break; } @@ -583,7 +583,7 @@ ng_nat_rcvmsg(node_p node, item_p item, hook_p lasthook) /* Delete entry from our internal list. */ priv->rdrcount--; STAILQ_REMOVE(&priv->redirhead, entry, ng_nat_rdr_lst, entries); - FREE(entry, M_NETGRAPH); + free(entry, M_NETGRAPH); } break; case NGM_NAT_ADD_SERVER: @@ -785,12 +785,12 @@ ng_nat_shutdown(node_p node) while (!STAILQ_EMPTY(&priv->redirhead)) { struct ng_nat_rdr_lst *entry = STAILQ_FIRST(&priv->redirhead); STAILQ_REMOVE_HEAD(&priv->redirhead, entries); - FREE(entry, M_NETGRAPH); + free(entry, M_NETGRAPH); }; /* Final free. */ LibAliasUninit(priv->lib); - FREE(priv, M_NETGRAPH); + free(priv, M_NETGRAPH); return (0); } |