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_base.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_base.c')
-rw-r--r-- | sys/netgraph/ng_base.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/netgraph/ng_base.c b/sys/netgraph/ng_base.c index af11cb9..00b316b 100644 --- a/sys/netgraph/ng_base.c +++ b/sys/netgraph/ng_base.c @@ -336,12 +336,12 @@ static ng_ID_t nextID = 1; int total; \ \ if (((m)->m_flags & M_PKTHDR) == 0) \ - panic("%s: !PKTHDR", __FUNCTION__); \ + panic("%s: !PKTHDR", __func__); \ for (total = 0, n = (m); n != NULL; n = n->m_next) \ total += n->m_len; \ if ((m)->m_pkthdr.len != total) { \ panic("%s: %d != %d", \ - __FUNCTION__, (m)->m_pkthdr.len, total); \ + __func__, (m)->m_pkthdr.len, total); \ } \ } while (0) #else @@ -2590,7 +2590,7 @@ ng_generic_msg(node_p here, item_p item, hook_p lasthook) if (ni->hooks >= nhooks) { log(LOG_ERR, "%s: number of %s changed\n", - __FUNCTION__, "hooks"); + __func__, "hooks"); break; } if (NG_HOOK_NOT_VALID(hook)) @@ -2645,7 +2645,7 @@ ng_generic_msg(node_p here, item_p item, hook_p lasthook) if (nl->numnames >= num) { log(LOG_ERR, "%s: number of %s changed\n", - __FUNCTION__, "nodes"); + __func__, "nodes"); break; } if (NG_NODE_NOT_VALID(node)) @@ -2693,7 +2693,7 @@ ng_generic_msg(node_p here, item_p item, hook_p lasthook) if (tl->numtypes >= num) { log(LOG_ERR, "%s: number of %s changed\n", - __FUNCTION__, "types"); + __func__, "types"); break; } strncpy(tp->type_name, type->name, NG_TYPELEN); |