__FUNCTION__ --> __func__

Obtained from:	KAME
MFC after:	1 week

1 files changed, 8 insertions, 8 deletions

diff --git a/usr.sbin/rtsold/probe.c b/usr.sbin/rtsold/probe.c
index 34bb66e..c7b07e2 100644
--- a/usr.sbin/rtsold/probe.c
+++ b/usr.sbin/rtsold/probe.c
@@ -73,18 +73,18 @@ probe_init()
 	
 	if (sndcmsgbuf == NULL &&
 	    (sndcmsgbuf = (u_char *)malloc(scmsglen)) == NULL) {
-		warnmsg(LOG_ERR, __FUNCTION__, "malloc failed");
+		warnmsg(LOG_ERR, __func__, "malloc failed");
 		return(-1);
 	}
 
 	if ((probesock = socket(AF_INET6, SOCK_RAW, IPPROTO_NONE)) < 0) {
-		warnmsg(LOG_ERR, __FUNCTION__, "socket: %s", strerror(errno));
+		warnmsg(LOG_ERR, __func__, "socket: %s", strerror(errno));
 		return(-1);
 	}
 
 	/* make the socket send-only */
 	if (shutdown(probesock, 0)) {
-		warnmsg(LOG_ERR, __FUNCTION__, "shutdown: %s", strerror(errno));
+		warnmsg(LOG_ERR, __func__, "shutdown: %s", strerror(errno));
 		return(-1);
 	}
 
@@ -109,13 +109,13 @@ defrouter_probe(int ifindex)
 	u_char ntopbuf[INET6_ADDRSTRLEN];
 
 	if ((s = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
-		warnmsg(LOG_ERR, __FUNCTION__, "socket: %s", strerror(errno));
+		warnmsg(LOG_ERR, __func__, "socket: %s", strerror(errno));
 		return;
 	}
 	bzero(&dr, sizeof(dr));
 	strcpy(dr.ifname, "lo0"); /* dummy interface */
 	if (ioctl(s, SIOCGDRLST_IN6, (caddr_t)&dr) < 0) {
-		warnmsg(LOG_ERR, __FUNCTION__, "ioctl(SIOCGDRLST_IN6): %s",
+		warnmsg(LOG_ERR, __func__, "ioctl(SIOCGDRLST_IN6): %s",
 		       strerror(errno));
 		goto closeandend;
 	}
@@ -124,7 +124,7 @@ defrouter_probe(int ifindex)
 		if (ifindex && dr.defrouter[i].if_index == ifindex) {
 			/* sanity check */
 			if (!IN6_IS_ADDR_LINKLOCAL(&dr.defrouter[i].rtaddr)) {
-				warnmsg(LOG_ERR, __FUNCTION__,
+				warnmsg(LOG_ERR, __func__,
 					"default router list contains a "
 					"non-linklocal address(%s)",
 				       inet_ntop(AF_INET6,
@@ -179,12 +179,12 @@ sendprobe(struct in6_addr *addr, int ifindex)
 		memcpy(CMSG_DATA(cm), &hoplimit, sizeof(int));
 	}
 
-	warnmsg(LOG_DEBUG, __FUNCTION__, "probe a router %s on %s",
+	warnmsg(LOG_DEBUG, __func__, "probe a router %s on %s",
 	       inet_ntop(AF_INET6, addr, ntopbuf, INET6_ADDRSTRLEN),
 	       if_indextoname(ifindex, ifnamebuf));
 
 	if (sendmsg(probesock, &sndmhdr, 0))
-		warnmsg(LOG_ERR, __FUNCTION__, "sendmsg on %s: %s",
+		warnmsg(LOG_ERR, __func__, "sendmsg on %s: %s",
 			if_indextoname(ifindex, ifnamebuf), strerror(errno));
 
 	return;