Use the ISO standard function variable vs. a GCC'ism.

4 files changed, 11 insertions, 11 deletions

diff --git a/sys/netgraph/atm/atmpif/ng_atmpif_harp.c b/sys/netgraph/atm/atmpif/ng_atmpif_harp.c
index aa3136503b1b..65ca61976b2e 100644
--- a/sys/netgraph/atm/atmpif/ng_atmpif_harp.c
+++ b/sys/netgraph/atm/atmpif/ng_atmpif_harp.c
@@ -836,7 +836,7 @@ vatmpif_harp_recv_drain(Vatmpif_unit *vup, KBuffer *m,
 
 	if (IS_VATMPIF_DEBUG_PACKET(vup))
 		atm_dev_pdu_print((Cmn_unit *)vup, (Cmn_vcc *)vvp, m,
-		    __FUNCTION__);
+		    __func__);
 
 	/*
 	 * Get packet PDU length
diff --git a/sys/netgraph/atm/ng_atm.c b/sys/netgraph/atm/ng_atm.c
index 65364cc0a6e6..b8a489ef6f7a 100644
--- a/sys/netgraph/atm/ng_atm.c
+++ b/sys/netgraph/atm/ng_atm.c
@@ -1262,18 +1262,18 @@ ng_atm_attach(struct ifnet *ifp)
 	node_p node;
 	struct priv *priv;
 
-	KASSERT(IFP2NG(ifp) == 0, ("%s: node alreay exists?", __FUNCTION__));
+	KASSERT(IFP2NG(ifp) == 0, ("%s: node alreay exists?", __func__));
 
 	if (ng_make_node_common(&ng_atm_typestruct, &node) != 0) {
 		log(LOG_ERR, "%s: can't create node for %s\n",
-		    __FUNCTION__, ifp->if_xname);
+		    __func__, ifp->if_xname);
 		return;
 	}
 
 	priv = malloc(sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO);
 	if (priv == NULL) {
 		log(LOG_ERR, "%s: can't allocate memory for %s\n",
-		    __FUNCTION__, ifp->if_xname);
+		    __func__, ifp->if_xname);
 		NG_NODE_UNREF(node);
 		return;
 	}
@@ -1284,7 +1284,7 @@ ng_atm_attach(struct ifnet *ifp)
 
 	if (ng_name_node(node, ifp->if_xname) != 0) {
 		log(LOG_WARNING, "%s: can't name node %s\n",
-		    __FUNCTION__, ifp->if_xname);
+		    __func__, ifp->if_xname);
 	}
 }
 
diff --git a/sys/netgraph/atm/sscop/ng_sscop.c b/sys/netgraph/atm/sscop/ng_sscop.c
index cb9752173194..cf52cc9de654 100644
--- a/sys/netgraph/atm/sscop/ng_sscop.c
+++ b/sys/netgraph/atm/sscop/ng_sscop.c
@@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$");
 #include <netgraph/atm/sscop/ng_sscop_cust.h>
 #include <netnatm/saal/sscop.h>
 
-#define DDD printf("%s: %d\n", __FUNCTION__, __LINE__)
+#define DDD printf("%s: %d\n", __func__, __LINE__)
 
 #ifdef SSCOP_DEBUG
 #define VERBOSE(P,M,F)							\
diff --git a/sys/netgraph/atm/uni/ng_uni.c b/sys/netgraph/atm/uni/ng_uni.c
index 915b53b07373..4cf635332378 100644
--- a/sys/netgraph/atm/uni/ng_uni.c
+++ b/sys/netgraph/atm/uni/ng_uni.c
@@ -499,7 +499,7 @@ ng_uni_disconnect(hook_p hook)
 	else if(hook == priv->upper)
 		priv->upper = NULL;
 	else
-		printf("%s: bogus hook %s\n", __FUNCTION__, NG_HOOK_NAME(hook));
+		printf("%s: bogus hook %s\n", __func__, NG_HOOK_NAME(hook));
 
 	if (NG_NODE_NUMHOOKS(node) == 0) {
 		if (NG_NODE_IS_VALID(node))
@@ -543,7 +543,7 @@ ng_uni_rcvupper(hook_p hook, item_p item)
 	m_freem(m);
 
 	if (uni_msg_len(msg) < sizeof(arg)) {
-		printf("%s: packet too short\n", __FUNCTION__);
+		printf("%s: packet too short\n", __func__);
 		uni_msg_destroy(msg);
 		return (EINVAL);
 	}
@@ -552,7 +552,7 @@ ng_uni_rcvupper(hook_p hook, item_p item)
 	msg->b_rptr += sizeof(arg);
 
 	if (arg.sig >= UNIAPI_MAXSIG) {
-		printf("%s: bogus signal\n", __FUNCTION__);
+		printf("%s: bogus signal\n", __func__);
 		uni_msg_destroy(msg);
 		return (EINVAL);
 	}
@@ -683,7 +683,7 @@ ng_uni_rcvlower(hook_p hook __unused, item_p item)
 
 	if (uni_msg_len(msg) < sizeof(arg)) {
 		uni_msg_destroy(msg);
-		printf("%s: packet too short\n", __FUNCTION__);
+		printf("%s: packet too short\n", __func__);
 		return (EINVAL);
 	}
 	bcopy(msg->b_rptr, &arg, sizeof(arg));
@@ -691,7 +691,7 @@ ng_uni_rcvlower(hook_p hook __unused, item_p item)
 
 	if (arg.sig > SAAL_UDATA_indication) {
 		uni_msg_destroy(msg);
-		printf("%s: bogus signal\n", __FUNCTION__);
+		printf("%s: bogus signal\n", __func__);
 		return (EINVAL);
 	}