diff options
| author | obrien <obrien@FreeBSD.org> | 2001-12-10 08:09:49 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2001-12-10 08:09:49 +0000 |
| commit | 7fd9a6a23abf2fb25b5925b444d0eed93c8d06f6 (patch) | |
| tree | b580d740769b3b201f76ad941e8b0b8ca3015bc0 /sys/netgraph/ng_one2many.c | |
| parent | 957a76ab241ec60b1b21124054416935dba9688b (diff) | |
| download | FreeBSD-src-7fd9a6a23abf2fb25b5925b444d0eed93c8d06f6.zip FreeBSD-src-7fd9a6a23abf2fb25b5925b444d0eed93c8d06f6.tar.gz | |
Update to C99, s/__FUNCTION__/__func__/,
also don't use ANSI string concatenation.
Diffstat (limited to 'sys/netgraph/ng_one2many.c')
| -rw-r--r-- | sys/netgraph/ng_one2many.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/netgraph/ng_one2many.c b/sys/netgraph/ng_one2many.c index ead577a..da1c7eb 100644 --- a/sys/netgraph/ng_one2many.c +++ b/sys/netgraph/ng_one2many.c @@ -391,12 +391,12 @@ ng_one2many_rcvdata(hook_p hook, item_p item) linkNum = (int)NG_HOOK_PRIVATE(hook); KASSERT(linkNum == NG_ONE2MANY_ONE_LINKNUM || (linkNum >= 0 && linkNum < NG_ONE2MANY_MAX_LINKS), - ("%s: linkNum=%d", __FUNCTION__, linkNum)); + ("%s: linkNum=%d", __func__, linkNum)); /* Figure out source link */ src = (linkNum == NG_ONE2MANY_ONE_LINKNUM) ? &priv->one : &priv->many[linkNum]; - KASSERT(src->hook != NULL, ("%s: no src%d", __FUNCTION__, linkNum)); + KASSERT(src->hook != NULL, ("%s: no src%d", __func__, linkNum)); /* Update receive stats */ src->stats.recvPackets++; @@ -450,7 +450,7 @@ ng_one2many_rcvdata(hook_p hook, item_p item) break; #ifdef INVARIANTS default: - panic("%s: invalid xmitAlg", __FUNCTION__); + panic("%s: invalid xmitAlg", __func__); #endif } } else { @@ -475,7 +475,7 @@ ng_one2many_shutdown(node_p node) const priv_p priv = NG_NODE_PRIVATE(node); KASSERT(priv->numActiveMany == 0, - ("%s: numActiveMany=%d", __FUNCTION__, priv->numActiveMany)); + ("%s: numActiveMany=%d", __func__, priv->numActiveMany)); FREE(priv, M_NETGRAPH); NG_NODE_SET_PRIVATE(node, NULL); NG_NODE_UNREF(node); @@ -495,7 +495,7 @@ ng_one2many_disconnect(hook_p hook) linkNum = (int)NG_HOOK_PRIVATE(hook); KASSERT(linkNum == NG_ONE2MANY_ONE_LINKNUM || (linkNum >= 0 && linkNum < NG_ONE2MANY_MAX_LINKS), - ("%s: linkNum=%d", __FUNCTION__, linkNum)); + ("%s: linkNum=%d", __func__, linkNum)); /* Nuke the link */ if (linkNum == NG_ONE2MANY_ONE_LINKNUM) @@ -538,7 +538,7 @@ ng_one2many_update_many(priv_p priv) break; #ifdef INVARIANTS default: - panic("%s: invalid failAlg", __FUNCTION__); + panic("%s: invalid failAlg", __func__); #endif } } @@ -553,7 +553,7 @@ ng_one2many_update_many(priv_p priv) break; #ifdef INVARIANTS default: - panic("%s: invalid xmitAlg", __FUNCTION__); + panic("%s: invalid xmitAlg", __func__); #endif } } |
