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_async.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_async.c')
-rw-r--r-- | sys/netgraph/ng_async.c | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/sys/netgraph/ng_async.c b/sys/netgraph/ng_async.c index 6cb5345..6841617 100644 --- a/sys/netgraph/ng_async.c +++ b/sys/netgraph/ng_async.c @@ -183,23 +183,21 @@ nga_constructor(node_p node) { sc_p sc; - MALLOC(sc, sc_p, sizeof(*sc), M_NETGRAPH_ASYNC, M_NOWAIT | M_ZERO); + sc = malloc(sizeof(*sc), M_NETGRAPH_ASYNC, M_NOWAIT | M_ZERO); if (sc == NULL) return (ENOMEM); sc->amode = MODE_HUNT; sc->cfg.accm = ~0; sc->cfg.amru = NG_ASYNC_DEFAULT_MRU; sc->cfg.smru = NG_ASYNC_DEFAULT_MRU; - MALLOC(sc->abuf, u_char *, - ASYNC_BUF_SIZE(sc->cfg.smru), M_NETGRAPH_ASYNC, M_NOWAIT); + sc->abuf = malloc( ASYNC_BUF_SIZE(sc->cfg.smru), M_NETGRAPH_ASYNC, M_NOWAIT); if (sc->abuf == NULL) goto fail; - MALLOC(sc->sbuf, u_char *, - SYNC_BUF_SIZE(sc->cfg.amru), M_NETGRAPH_ASYNC, M_NOWAIT); + sc->sbuf = malloc( SYNC_BUF_SIZE(sc->cfg.amru), M_NETGRAPH_ASYNC, M_NOWAIT); if (sc->sbuf == NULL) { - FREE(sc->abuf, M_NETGRAPH_ASYNC); + free(sc->abuf, M_NETGRAPH_ASYNC); fail: - FREE(sc, M_NETGRAPH_ASYNC); + free(sc, M_NETGRAPH_ASYNC); return (ENOMEM); } NG_NODE_SET_PRIVATE(node, sc); @@ -298,19 +296,19 @@ nga_rcvmsg(node_p node, item_p item, hook_p lasthook) ERROUT(EINVAL); cfg->enabled = !!cfg->enabled; /* normalize */ if (cfg->smru > sc->cfg.smru) { /* reallocate buffer */ - MALLOC(buf, u_char *, ASYNC_BUF_SIZE(cfg->smru), + buf = malloc(ASYNC_BUF_SIZE(cfg->smru), M_NETGRAPH_ASYNC, M_NOWAIT); if (!buf) ERROUT(ENOMEM); - FREE(sc->abuf, M_NETGRAPH_ASYNC); + free(sc->abuf, M_NETGRAPH_ASYNC); sc->abuf = buf; } if (cfg->amru > sc->cfg.amru) { /* reallocate buffer */ - MALLOC(buf, u_char *, SYNC_BUF_SIZE(cfg->amru), + buf = malloc(SYNC_BUF_SIZE(cfg->amru), M_NETGRAPH_ASYNC, M_NOWAIT); if (!buf) ERROUT(ENOMEM); - FREE(sc->sbuf, M_NETGRAPH_ASYNC); + free(sc->sbuf, M_NETGRAPH_ASYNC); sc->sbuf = buf; sc->amode = MODE_HUNT; sc->slen = 0; @@ -349,10 +347,10 @@ nga_shutdown(node_p node) { const sc_p sc = NG_NODE_PRIVATE(node); - FREE(sc->abuf, M_NETGRAPH_ASYNC); - FREE(sc->sbuf, M_NETGRAPH_ASYNC); + free(sc->abuf, M_NETGRAPH_ASYNC); + free(sc->sbuf, M_NETGRAPH_ASYNC); bzero(sc, sizeof(*sc)); - FREE(sc, M_NETGRAPH_ASYNC); + free(sc, M_NETGRAPH_ASYNC); NG_NODE_SET_PRIVATE(node, NULL); NG_NODE_UNREF(node); return (0); |