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_ether.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_ether.c')
| -rw-r--r-- | sys/netgraph/ng_ether.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/netgraph/ng_ether.c b/sys/netgraph/ng_ether.c index 69e1b35..a3c14e9 100644 --- a/sys/netgraph/ng_ether.c +++ b/sys/netgraph/ng_ether.c @@ -297,11 +297,11 @@ ng_ether_attach(struct ifnet *ifp) node_p node; /* Create node */ - KASSERT(!IFP2NG(ifp), ("%s: node already exists?", __FUNCTION__)); + KASSERT(!IFP2NG(ifp), ("%s: node already exists?", __func__)); snprintf(name, sizeof(name), "%s%d", ifp->if_name, ifp->if_unit); if (ng_make_node_common(&ng_ether_typestruct, &node) != 0) { log(LOG_ERR, "%s: can't %s for %s\n", - __FUNCTION__, "create node", name); + __func__, "create node", name); return; } @@ -309,7 +309,7 @@ ng_ether_attach(struct ifnet *ifp) MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO); if (priv == NULL) { log(LOG_ERR, "%s: can't %s for %s\n", - __FUNCTION__, "allocate memory", name); + __func__, "allocate memory", name); NG_NODE_UNREF(node); return; } @@ -321,7 +321,7 @@ ng_ether_attach(struct ifnet *ifp) /* Try to give the node the same name as the interface */ if (ng_name_node(node, name) != 0) { log(LOG_WARNING, "%s: can't name node %s\n", - __FUNCTION__, name); + __func__, name); } } @@ -608,7 +608,7 @@ ng_ether_rcvdata(hook_p hook, item_p item) return ng_ether_rcv_lower(node, m, meta); if (hook == priv->upper) return ng_ether_rcv_upper(node, m, meta); - panic("%s: weird hook", __FUNCTION__); + panic("%s: weird hook", __func__); #ifdef RESTARTABLE_PANICS /* so we don;t get an error msg in LINT */ return NULL; #endif @@ -721,7 +721,7 @@ ng_ether_disconnect(hook_p hook) priv->lower = NULL; priv->lowerOrphan = 0; } else - panic("%s: weird hook", __FUNCTION__); + panic("%s: weird hook", __func__); if ((NG_NODE_NUMHOOKS(NG_HOOK_NODE(hook)) == 0) && (NG_NODE_IS_VALID(NG_HOOK_NODE(hook)))) ng_rmnode_self(NG_HOOK_NODE(hook)); /* reset node */ |
