From 7fd9a6a23abf2fb25b5925b444d0eed93c8d06f6 Mon Sep 17 00:00:00 2001
From: obrien <obrien@FreeBSD.org>
Date: Mon, 10 Dec 2001 08:09:49 +0000
Subject: Update to C99, s/__FUNCTION__/__func__/, also don't use ANSI string
 concatenation.

---
 sys/netgraph/ng_base.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'sys/netgraph/ng_base.c')

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);
-- 
cgit v1.1