Update to C99, s/__FUNCTION__/__func__/,

also don't use ANSI string concatenation.

1 files changed, 10 insertions, 10 deletions

diff --git a/sys/netgraph/ng_bridge.c b/sys/netgraph/ng_bridge.c
index b549517..9d93201 100644
--- a/sys/netgraph/ng_bridge.c
+++ b/sys/netgraph/ng_bridge.c
@@ -533,9 +533,9 @@ ng_bridge_rcvdata(hook_p hook, item_p item)
 	/* Get link number */
 	linkNum = (int)NG_HOOK_PRIVATE(hook);
 	KASSERT(linkNum >= 0 && linkNum < NG_BRIDGE_MAX_LINKS,
-	    ("%s: linkNum=%u", __FUNCTION__, linkNum));
+	    ("%s: linkNum=%u", __func__, linkNum));
 	link = priv->links[linkNum];
-	KASSERT(link != NULL, ("%s: link%d null", __FUNCTION__, linkNum));
+	KASSERT(link != NULL, ("%s: link%d null", __func__, linkNum));
 
 	/* Sanity check packet and pull up header */
 	if (m->m_pkthdr.len < ETHER_HDR_LEN) {
@@ -654,7 +654,7 @@ ng_bridge_rcvdata(hook_p hook, item_p item)
 
 			/* If destination same as incoming link, do nothing */
 			KASSERT(destLink != NULL,
-			    ("%s: link%d null", __FUNCTION__, host->linkNum));
+			    ("%s: link%d null", __func__, host->linkNum));
 			if (destLink == link) {
 				NG_FREE_ITEM(item);
 				NG_FREE_M(m);
@@ -768,7 +768,7 @@ ng_bridge_shutdown(node_p node)
 
 	KASSERT(priv->numLinks == 0 && priv->numHosts == 0,
 	    ("%s: numLinks=%d numHosts=%d",
-	    __FUNCTION__, priv->numLinks, priv->numHosts));
+	    __func__, priv->numLinks, priv->numHosts));
 	FREE(priv->tab, M_NETGRAPH_BRIDGE);
 	FREE(priv, M_NETGRAPH_BRIDGE);
 	NG_NODE_SET_PRIVATE(node, NULL);
@@ -788,13 +788,13 @@ ng_bridge_disconnect(hook_p hook)
 	/* Get link number */
 	linkNum = (int)NG_HOOK_PRIVATE(hook);
 	KASSERT(linkNum >= 0 && linkNum < NG_BRIDGE_MAX_LINKS,
-	    ("%s: linkNum=%u", __FUNCTION__, linkNum));
+	    ("%s: linkNum=%u", __func__, linkNum));
 
 	/* Remove all hosts associated with this link */
 	ng_bridge_remove_hosts(priv, linkNum);
 
 	/* Free associated link information */
-	KASSERT(priv->links[linkNum] != NULL, ("%s: no link", __FUNCTION__));
+	KASSERT(priv->links[linkNum] != NULL, ("%s: no link", __func__));
 	FREE(priv->links[linkNum], M_NETGRAPH_BRIDGE);
 	priv->links[linkNum] = NULL;
 	priv->numLinks--;
@@ -851,7 +851,7 @@ ng_bridge_put(priv_p priv, const u_char *addr, int linkNum)
 	/* Assert that entry does not already exist in hashtable */
 	SLIST_FOREACH(hent, &priv->tab[bucket], next) {
 		KASSERT(!ETHER_EQUAL(hent->host.addr, addr),
-		    ("%s: entry %6D exists in table", __FUNCTION__, addr, ":"));
+		    ("%s: entry %6D exists in table", __func__, addr, ":"));
 	}
 #endif
 
@@ -998,7 +998,7 @@ ng_bridge_timeout(void *arg)
 			/* Make sure host's link really exists */
 			KASSERT(priv->links[hent->host.linkNum] != NULL,
 			    ("%s: host %6D on nonexistent link %d\n",
-			    __FUNCTION__, hent->host.addr, ":",
+			    __func__, hent->host.addr, ":",
 			    hent->host.linkNum));
 
 			/* Remove hosts we haven't heard from in a while */
@@ -1015,7 +1015,7 @@ ng_bridge_timeout(void *arg)
 		}
 	}
 	KASSERT(priv->numHosts == counter,
-	    ("%s: hosts: %d != %d", __FUNCTION__, priv->numHosts, counter));
+	    ("%s: hosts: %d != %d", __func__, priv->numHosts, counter));
 
 	/* Decrease table size if necessary */
 	ng_bridge_rehash(priv);
@@ -1038,7 +1038,7 @@ ng_bridge_timeout(void *arg)
 		}
 	}
 	KASSERT(priv->numLinks == counter,
-	    ("%s: links: %d != %d", __FUNCTION__, priv->numLinks, counter));
+	    ("%s: links: %d != %d", __func__, priv->numLinks, counter));
 
 	/* Done */
 	splx(s);