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_base.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_base.c')
| -rw-r--r-- | sys/netgraph/ng_base.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/netgraph/ng_base.c b/sys/netgraph/ng_base.c index 2a84d429..6a0ce88 100644 --- a/sys/netgraph/ng_base.c +++ b/sys/netgraph/ng_base.c @@ -234,9 +234,9 @@ MALLOC_DEFINE(M_NETGRAPH_MSG, "netgraph_msg", "netgraph name storage"); /* Should not be visible outside this file */ #define _NG_ALLOC_HOOK(hook) \ - MALLOC(hook, hook_p, sizeof(*hook), M_NETGRAPH_HOOK, M_NOWAIT | M_ZERO) + hook = malloc(sizeof(*hook), M_NETGRAPH_HOOK, M_NOWAIT | M_ZERO) #define _NG_ALLOC_NODE(node) \ - MALLOC(node, node_p, sizeof(*node), M_NETGRAPH_NODE, M_NOWAIT | M_ZERO) + node = malloc(sizeof(*node), M_NETGRAPH_NODE, M_NOWAIT | M_ZERO) #define NG_QUEUE_LOCK_INIT(n) \ mtx_init(&(n)->q_mtx, "ng_node", NULL, MTX_DEF) @@ -339,8 +339,8 @@ ng_alloc_node(void) #define NG_ALLOC_HOOK(hook) _NG_ALLOC_HOOK(hook) #define NG_ALLOC_NODE(node) _NG_ALLOC_NODE(node) -#define NG_FREE_HOOK(hook) do { FREE((hook), M_NETGRAPH_HOOK); } while (0) -#define NG_FREE_NODE(node) do { FREE((node), M_NETGRAPH_NODE); } while (0) +#define NG_FREE_HOOK(hook) do { free((hook), M_NETGRAPH_HOOK); } while (0) +#define NG_FREE_NODE(node) do { free((node), M_NETGRAPH_NODE); } while (0) #endif /* NETGRAPH_DEBUG */ /*----------------------------------------------*/ |
