diff options
| author | dwmalone <dwmalone@FreeBSD.org> | 2000-11-18 15:17:43 +0000 |
|---|---|---|
| committer | dwmalone <dwmalone@FreeBSD.org> | 2000-11-18 15:17:43 +0000 |
| commit | 918549eb3151450239d659ae968cb9e68b863bfc (patch) | |
| tree | 5e63335d7dfc31ef8cf13f89356a8b83776cef7e /sys/netgraph/ng_bridge.c | |
| parent | f96d89a937a5b22a14182cb1b88b68dc430ee718 (diff) | |
| download | FreeBSD-src-918549eb3151450239d659ae968cb9e68b863bfc.zip FreeBSD-src-918549eb3151450239d659ae968cb9e68b863bfc.tar.gz | |
Add the use of M_ZERO to netgraph.
Submitted by: josh@zipperup.org
Submitted by: Robert Drehmel <robd@gmx.net>
Submitted by: archie
Approved by: archie
Diffstat (limited to 'sys/netgraph/ng_bridge.c')
| -rw-r--r-- | sys/netgraph/ng_bridge.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/sys/netgraph/ng_bridge.c b/sys/netgraph/ng_bridge.c index f2c662a..4c27798 100644 --- a/sys/netgraph/ng_bridge.c +++ b/sys/netgraph/ng_bridge.c @@ -299,20 +299,18 @@ ng_bridge_constructor(node_p *nodep) int error; /* Allocate and initialize private info */ - MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT); + MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO); if (priv == NULL) return (ENOMEM); - bzero(priv, sizeof(*priv)); callout_init(&priv->timer); /* Allocate and initialize hash table, etc. */ MALLOC(priv->tab, struct ng_bridge_bucket *, - MIN_BUCKETS * sizeof(*priv->tab), M_NETGRAPH, M_NOWAIT); + MIN_BUCKETS * sizeof(*priv->tab), M_NETGRAPH, M_NOWAIT | M_ZERO); if (priv->tab == NULL) { FREE(priv, M_NETGRAPH); return (ENOMEM); } - bzero(priv->tab, MIN_BUCKETS * sizeof(*priv->tab)); /* init SLIST's */ priv->numBuckets = MIN_BUCKETS; priv->hashMask = MIN_BUCKETS - 1; priv->conf.debugLevel = 1; @@ -358,10 +356,9 @@ ng_bridge_newhook(node_p node, hook_p hook, const char *name) if (priv->links[linkNum] != NULL) return (EISCONN); MALLOC(priv->links[linkNum], struct ng_bridge_link *, - sizeof(*priv->links[linkNum]), M_NETGRAPH, M_NOWAIT); + sizeof(*priv->links[linkNum]), M_NETGRAPH, M_NOWAIT|M_ZERO); if (priv->links[linkNum] == NULL) return (ENOMEM); - bzero(priv->links[linkNum], sizeof(*priv->links[linkNum])); priv->links[linkNum]->hook = hook; LINK_NUM(hook) = linkNum; priv->numLinks++; @@ -854,10 +851,9 @@ ng_bridge_rehash(priv_p priv) /* Allocate and initialize new table */ MALLOC(newTab, struct ng_bridge_bucket *, - newNumBuckets * sizeof(*newTab), M_NETGRAPH, M_NOWAIT); + newNumBuckets * sizeof(*newTab), M_NETGRAPH, M_NOWAIT | M_ZERO); if (newTab == NULL) return; - bzero(newTab, newNumBuckets * sizeof(*newTab)); /* Move all entries from old table to new table */ for (oldBucket = 0; oldBucket < priv->numBuckets; oldBucket++) { |
