__FUNCTION__ --> __func__

Obtained from:	KAME
MFC after:	1 week

6 files changed, 67 insertions, 67 deletions

diff --git a/usr.sbin/rtsold/dump.c b/usr.sbin/rtsold/dump.c
index 0f75971..7915d92 100644
--- a/usr.sbin/rtsold/dump.c
+++ b/usr.sbin/rtsold/dump.c
@@ -100,7 +100,7 @@ rtsold_dump_file(dumpfile)
 	char *dumpfile;
 {
 	if ((fp = fopen(dumpfile, "w")) == NULL) {
-		warnmsg(LOG_WARNING, __FUNCTION__, "open a dump file(%s): %s",
+		warnmsg(LOG_WARNING, __func__, "open a dump file(%s): %s",
 			dumpfile, strerror(errno));
 		return;
 	}
diff --git a/usr.sbin/rtsold/if.c b/usr.sbin/rtsold/if.c
index 4566b73..27690ca 100644
--- a/usr.sbin/rtsold/if.c
+++ b/usr.sbin/rtsold/if.c
@@ -101,40 +101,40 @@ interface_up(char *name)
 	strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
 
 	if (ioctl(ifsock, SIOCGIFFLAGS, (caddr_t)&ifr) < 0) {
-		warnmsg(LOG_WARNING, __FUNCTION__, "ioctl(SIOCGIFFLAGS): %s",
+		warnmsg(LOG_WARNING, __func__, "ioctl(SIOCGIFFLAGS): %s",
 		       strerror(errno));
 		return(-1);
 	}
 	if (!(ifr.ifr_flags & IFF_UP)) {
 		ifr.ifr_flags |= IFF_UP;
 		if (ioctl(ifsock, SIOCSIFFLAGS, (caddr_t)&ifr) < 0) {
-			warnmsg(LOG_ERR, __FUNCTION__,
+			warnmsg(LOG_ERR, __func__,
 				"ioctl(SIOCSIFFLAGS): %s", strerror(errno));
 		}
 		return(-1);
 	}
 
-	warnmsg(LOG_DEBUG, __FUNCTION__, "checking if %s is ready...", name);
+	warnmsg(LOG_DEBUG, __func__, "checking if %s is ready...", name);
 
 	llflag = get_llflag(name);
 	if (llflag < 0) {
-		warnmsg(LOG_WARNING, __FUNCTION__,
+		warnmsg(LOG_WARNING, __func__,
 			"get_llflag() failed, anyway I'll try");
 		return 0;
 	}
 
 	if (!(llflag & IN6_IFF_NOTREADY)) {
-		warnmsg(LOG_DEBUG, __FUNCTION__,
+		warnmsg(LOG_DEBUG, __func__,
 			"%s is ready", name);
 		return(0);
 	} else {
 		if (llflag & IN6_IFF_TENTATIVE) {
-			warnmsg(LOG_DEBUG, __FUNCTION__, "%s is tentative",
+			warnmsg(LOG_DEBUG, __func__, "%s is tentative",
 			       name);
 			return IFS_TENTATIVE;
 		}
 		if (llflag & IN6_IFF_DUPLICATED)
-			warnmsg(LOG_DEBUG, __FUNCTION__, "%s is duplicated",
+			warnmsg(LOG_DEBUG, __func__, "%s is duplicated",
 			       name);
 		return -1;
 	}
@@ -151,7 +151,7 @@ interface_status(struct ifinfo *ifinfo)
 	memset(&ifr, 0, sizeof(ifr));
 	strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
 	if (ioctl(ifsock, SIOCGIFFLAGS, &ifr) < 0) {
-		warnmsg(LOG_ERR, __FUNCTION__, "ioctl(SIOCGIFFLAGS) on %s: %s",
+		warnmsg(LOG_ERR, __func__, "ioctl(SIOCGIFFLAGS) on %s: %s",
 		       ifname, strerror(errno));
 		return(-1);
 	}
@@ -171,7 +171,7 @@ interface_status(struct ifinfo *ifinfo)
 
 	if (ioctl(ifsock, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) {
 		if (errno != EINVAL) {
-			warnmsg(LOG_DEBUG, __FUNCTION__,
+			warnmsg(LOG_DEBUG, __func__,
 				"ioctl(SIOCGIFMEDIA) on %s: %s",
 			       ifname, strerror(errno));
 			return(-1);
@@ -244,7 +244,7 @@ lladdropt_fill(struct sockaddr_dl *sdl, struct nd_opt_hdr *ndopt)
 		 memcpy(addr, LLADDR(sdl), ETHER_ADDR_LEN);
 		 break;
 	 default:
-		 warnmsg(LOG_ERR, __FUNCTION__,
+		 warnmsg(LOG_ERR, __func__,
 			 "unsupported link type(%d)", sdl->sdl_type);
 		 exit(1);
 	}
@@ -333,12 +333,12 @@ get_llflag(const char *name)
 	int s;
 
 	if ((s = socket(PF_INET6, SOCK_DGRAM, 0)) < 0) {
-		warnmsg(LOG_ERR, __FUNCTION__, "socket(SOCK_DGRAM): %s",
+		warnmsg(LOG_ERR, __func__, "socket(SOCK_DGRAM): %s",
 		    strerror(errno));
 		exit(1);
 	}
 	if (getifaddrs(&ifap) != 0) {
-		warnmsg(LOG_ERR, __FUNCTION__, "etifaddrs: %s",
+		warnmsg(LOG_ERR, __func__, "etifaddrs: %s",
 		    strerror(errno));
 		exit(1);
 	}
@@ -357,7 +357,7 @@ get_llflag(const char *name)
 		strcpy(ifr6.ifr_name, name);
 		memcpy(&ifr6.ifr_ifru.ifru_addr, sin6, sin6->sin6_len);
 		if (ioctl(s, SIOCGIFAFLAG_IN6, &ifr6) < 0) {
-			warnmsg(LOG_ERR, __FUNCTION__,
+			warnmsg(LOG_ERR, __func__,
 			    "ioctl(SIOCGIFAFLAG_IN6): %s", strerror(errno));
 			exit(1);
 		}
@@ -382,12 +382,12 @@ get_llflag(const char *name)
 	maxif = if_maxindex() + 1;
 	iflist = (struct ifreq *)malloc(maxif * BUFSIZ);	/* XXX */
 	if (iflist == NULL) {
-		warnmsg(LOG_ERR, __FUNCTION__, "not enough core");
+		warnmsg(LOG_ERR, __func__, "not enough core");
 		exit(1);
 	}
 
 	if ((s = socket(PF_INET6, SOCK_DGRAM, 0)) < 0) {
-		warnmsg(LOG_ERR, __FUNCTION__, "socket(SOCK_DGRAM): %s",
+		warnmsg(LOG_ERR, __func__, "socket(SOCK_DGRAM): %s",
 		    strerror(errno));
 		exit(1);
 	}
@@ -395,7 +395,7 @@ get_llflag(const char *name)
 	ifconf.ifc_req = iflist;
 	ifconf.ifc_len = maxif * BUFSIZ;	/* XXX */
 	if (ioctl(s, SIOCGIFCONF, &ifconf) < 0) {
-		warnmsg(LOG_ERR, __FUNCTION__, "ioctl(SIOCGIFCONF): %s",
+		warnmsg(LOG_ERR, __func__, "ioctl(SIOCGIFCONF): %s",
 		    strerror(errno));
 		exit(1);
 	}
@@ -419,7 +419,7 @@ get_llflag(const char *name)
 		strcpy(ifr6.ifr_name, name);
 		memcpy(&ifr6.ifr_ifru.ifru_addr, sin6, sin6->sin6_len);
 		if (ioctl(s, SIOCGIFAFLAG_IN6, &ifr6) < 0) {
-			warnmsg(LOG_ERR, __FUNCTION__,
+			warnmsg(LOG_ERR, __func__,
 			    "ioctl(SIOCGIFAFLAG_IN6): %s", strerror(errno));
 			exit(1);
 		}
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;
diff --git a/usr.sbin/rtsold/rtsock.c b/usr.sbin/rtsold/rtsock.c
index f1c4be8..429b78b 100644
--- a/usr.sbin/rtsold/rtsock.c
+++ b/usr.sbin/rtsold/rtsock.c
@@ -112,7 +112,7 @@ rtsock_input(s)
 			break;
 
 		if (dflag > 1) {
-			warnmsg(LOG_INFO, __FUNCTION__,
+			warnmsg(LOG_INFO, __func__,
 			    "rtmsg type %d, len=%lu", rtm->rtm_type,
 			    (u_long)len);
 		}
@@ -121,7 +121,7 @@ rtsock_input(s)
 			if (rtm->rtm_type != rtsock_dispatch[idx].type)
 				continue;
 			if (rtm->rtm_msglen < rtsock_dispatch[idx].minlen) {
-				warnmsg(LOG_INFO, __FUNCTION__,
+				warnmsg(LOG_INFO, __func__,
 				    "rtmsg type %d too short!", rtm->rtm_type);
 				continue;
 			}
@@ -156,16 +156,16 @@ rtsock_input_ifannounce(s, rtm, lim)
 		 * we may be able to do a name-based interface match,
 		 * and call ifreconfig() to enable the interface again.
 		 */
-		warnmsg(LOG_INFO, __FUNCTION__,
+		warnmsg(LOG_INFO, __func__,
 		    "interface %s inserted", ifan->ifan_name);
 		break;
 	case IFAN_DEPARTURE:
-		warnmsg(LOG_WARNING, __FUNCTION__,
+		warnmsg(LOG_WARNING, __func__,
 		    "interface %s removed", ifan->ifan_name);
 		ifinfo = find_ifinfo(ifan->ifan_index);
 		if (ifinfo) {
 			if (dflag > 1) {
-				warnmsg(LOG_INFO, __FUNCTION__,
+				warnmsg(LOG_INFO, __func__,
 				    "bring interface %s to DOWN state",
 				    ifan->ifan_name);
 			}
diff --git a/usr.sbin/rtsold/rtsol.c b/usr.sbin/rtsold/rtsol.c
index 5086ea9..0543bca 100644
--- a/usr.sbin/rtsold/rtsol.c
+++ b/usr.sbin/rtsold/rtsol.c
@@ -82,12 +82,12 @@ sockopen()
 	sndcmsglen = rcvcmsglen = CMSG_SPACE(sizeof(struct in6_pktinfo)) +
 		CMSG_SPACE(sizeof(int));
 	if (rcvcmsgbuf == NULL && (rcvcmsgbuf = malloc(rcvcmsglen)) == NULL) {
-		warnmsg(LOG_ERR, __FUNCTION__,
+		warnmsg(LOG_ERR, __func__,
 			"malloc for receive msghdr failed");
 		return(-1);
 	}
 	if (sndcmsgbuf == NULL && (sndcmsgbuf = malloc(sndcmsglen)) == NULL) { 
-		warnmsg(LOG_ERR, __FUNCTION__,
+		warnmsg(LOG_ERR, __func__,
 			"malloc for send msghdr failed");
 		return(-1);
 	}
@@ -96,13 +96,13 @@ sockopen()
 	sin6_allrouters.sin6_len = sizeof(sin6_allrouters);
 	if (inet_pton(AF_INET6, ALLROUTER,
 		      &sin6_allrouters.sin6_addr.s6_addr) != 1) {
-		warnmsg(LOG_ERR, __FUNCTION__, "inet_pton failed for %s",
+		warnmsg(LOG_ERR, __func__, "inet_pton failed for %s",
 		       ALLROUTER);
 		return(-1);
 	}
 
 	if ((rssock = socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6)) < 0) {
-		warnmsg(LOG_ERR, __FUNCTION__, "socket: %s", strerror(errno));
+		warnmsg(LOG_ERR, __func__, "socket: %s", strerror(errno));
 		return(-1);
 	}
 
@@ -111,14 +111,14 @@ sockopen()
 #ifdef IPV6_RECVPKTINFO
 	if (setsockopt(rssock, IPPROTO_IPV6, IPV6_RECVPKTINFO, &on,
 		       sizeof(on)) < 0) {
-		warnmsg(LOG_ERR, __FUNCTION__, "IPV6_RECVPKTINFO: %s",
+		warnmsg(LOG_ERR, __func__, "IPV6_RECVPKTINFO: %s",
 		       strerror(errno));
 		exit(1);
 	}
 #else  /* old adv. API */
 	if (setsockopt(rssock, IPPROTO_IPV6, IPV6_PKTINFO, &on,
 		       sizeof(on)) < 0) {
-		warnmsg(LOG_ERR, __FUNCTION__, "IPV6_PKTINFO: %s",
+		warnmsg(LOG_ERR, __func__, "IPV6_PKTINFO: %s",
 		       strerror(errno));
 		exit(1);
 	}
@@ -129,14 +129,14 @@ sockopen()
 #ifdef IPV6_RECVHOPLIMIT
 	if (setsockopt(rssock, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, &on,
 		       sizeof(on)) < 0) {
-		warnmsg(LOG_ERR, __FUNCTION__, "IPV6_RECVHOPLIMIT: %s",
+		warnmsg(LOG_ERR, __func__, "IPV6_RECVHOPLIMIT: %s",
 		       strerror(errno));
 		exit(1);
 	}
 #else  /* old adv. API */
 	if (setsockopt(rssock, IPPROTO_IPV6, IPV6_HOPLIMIT, &on,
 		       sizeof(on)) < 0) {
-		warnmsg(LOG_ERR, __FUNCTION__, "IPV6_HOPLIMIT: %s",
+		warnmsg(LOG_ERR, __func__, "IPV6_HOPLIMIT: %s",
 		       strerror(errno));
 		exit(1);
 	}
@@ -147,7 +147,7 @@ sockopen()
 	ICMP6_FILTER_SETPASS(ND_ROUTER_ADVERT, &filt);
 	if (setsockopt(rssock, IPPROTO_ICMPV6, ICMP6_FILTER, &filt,
 		       sizeof(filt)) == -1) {
-		warnmsg(LOG_ERR, __FUNCTION__, "setsockopt(ICMP6_FILTER): %s",
+		warnmsg(LOG_ERR, __func__, "setsockopt(ICMP6_FILTER): %s",
 		       strerror(errno));
 		return(-1);
 	}
@@ -204,7 +204,7 @@ sendpacket(struct ifinfo *ifinfo)
 	}
 
 	warnmsg(LOG_DEBUG,
-	       __FUNCTION__, "send RS on %s, whose state is %d",
+	       __func__, "send RS on %s, whose state is %d",
 	       ifinfo->ifname, ifinfo->state);
 
 	i = sendmsg(rssock, &sndmhdr, 0);
@@ -215,7 +215,7 @@ sendpacket(struct ifinfo *ifinfo)
 		 * network cards on a mobile node. We ignore it.
 		 */
 		if (errno != ENETDOWN || dflag > 0)
-			warnmsg(LOG_ERR, __FUNCTION__, "sendmsg on %s: %s",
+			warnmsg(LOG_ERR, __func__, "sendmsg on %s: %s",
 				ifinfo->ifname, strerror(errno));
 	}
 
@@ -237,7 +237,7 @@ rtsol_input(int s)
 
 	/* get message */
 	if ((i = recvmsg(s, &rcvmhdr, 0)) < 0) {
-		warnmsg(LOG_ERR, __FUNCTION__, "recvmsg: %s", strerror(errno));
+		warnmsg(LOG_ERR, __func__, "recvmsg: %s", strerror(errno));
 		return;
 	}
 
@@ -259,25 +259,25 @@ rtsol_input(int s)
 
 	if (ifindex == 0) {
 		warnmsg(LOG_ERR,
-		       __FUNCTION__, "failed to get receiving interface");
+		       __func__, "failed to get receiving interface");
 		return;
 	}
 	if (hlimp == NULL) {
 		warnmsg(LOG_ERR,
-		       __FUNCTION__, "failed to get receiving hop limit");
+		       __func__, "failed to get receiving hop limit");
 		return;
 	}
 
 	if (i < sizeof(struct nd_router_advert)) {
 		warnmsg(LOG_ERR,
-		       __FUNCTION__, "packet size(%d) is too short", i);
+		       __func__, "packet size(%d) is too short", i);
 		return;
 	}
 
 	icp = (struct icmp6_hdr *)rcvmhdr.msg_iov[0].iov_base;
 
 	if (icp->icmp6_type != ND_ROUTER_ADVERT) {
-		warnmsg(LOG_ERR, __FUNCTION__,
+		warnmsg(LOG_ERR, __func__,
 			"invalid icmp type(%d) from %s on %s", icp->icmp6_type,
 		       inet_ntop(AF_INET6, &from.sin6_addr, ntopbuf,
 				 INET6_ADDRSTRLEN),
@@ -286,7 +286,7 @@ rtsol_input(int s)
 	}
 
 	if (icp->icmp6_code != 0) {
-		warnmsg(LOG_ERR, __FUNCTION__,
+		warnmsg(LOG_ERR, __func__,
 			"invalid icmp code(%d) from %s on %s", icp->icmp6_code,
 		       inet_ntop(AF_INET6, &from.sin6_addr, ntopbuf,
 				 INET6_ADDRSTRLEN),
@@ -295,7 +295,7 @@ rtsol_input(int s)
 	}
 
 	if (*hlimp != 255) {
-		warnmsg(LOG_NOTICE, __FUNCTION__,
+		warnmsg(LOG_NOTICE, __func__,
 			"invalid RA with hop limit(%d) from %s on %s",
 		       *hlimp,
 		       inet_ntop(AF_INET6, &from.sin6_addr, ntopbuf,
@@ -305,7 +305,7 @@ rtsol_input(int s)
 	}
 
 	if (pi && !IN6_IS_ADDR_LINKLOCAL(&from.sin6_addr)) {
-		warnmsg(LOG_NOTICE, __FUNCTION__,
+		warnmsg(LOG_NOTICE, __func__,
 			"invalid RA with non link-local source from %s on %s",
 		       inet_ntop(AF_INET6, &from.sin6_addr, ntopbuf,
 				 INET6_ADDRSTRLEN),
@@ -316,7 +316,7 @@ rtsol_input(int s)
 	/* xxx: more validation? */
 
 	if ((ifi = find_ifinfo(pi->ipi6_ifindex)) == NULL) {
-		warnmsg(LOG_NOTICE, __FUNCTION__,
+		warnmsg(LOG_NOTICE, __func__,
 			"received RA from %s on an unexpeced IF(%s)",
 		       inet_ntop(AF_INET6, &from.sin6_addr, ntopbuf,
 				 INET6_ADDRSTRLEN),
@@ -324,7 +324,7 @@ rtsol_input(int s)
 		return;
 	}
 
-	warnmsg(LOG_DEBUG, __FUNCTION__,
+	warnmsg(LOG_DEBUG, __func__,
 		"received RA from %s on %s, state is %d",
 	       inet_ntop(AF_INET6, &from.sin6_addr, ntopbuf,
 			 INET6_ADDRSTRLEN),
diff --git a/usr.sbin/rtsold/rtsold.c b/usr.sbin/rtsold/rtsold.c
index 82a7560..e3b9a61 100644
--- a/usr.sbin/rtsold/rtsold.c
+++ b/usr.sbin/rtsold/rtsold.c
@@ -259,7 +259,7 @@ main(argc, argv)
 		FILE *fp;
 
 		if ((fp = fopen(pidfilename, "w")) == NULL)
-			warnmsg(LOG_ERR, __FUNCTION__,
+			warnmsg(LOG_ERR, __func__,
 				"failed to open a log file(%s): %s",
 				pidfilename, strerror(errno));
 		else {
@@ -300,7 +300,7 @@ main(argc, argv)
 		e = select(maxfd + 1, &select_fd, NULL, NULL, timeout);
 		if (e < 1) {
 			if (e < 0 && errno != EINTR) {
-				warnmsg(LOG_ERR, __FUNCTION__, "select: %s",
+				warnmsg(LOG_ERR, __func__, "select: %s",
 				       strerror(errno));
 			}
 			continue;
@@ -325,19 +325,19 @@ ifconfig(char *ifname)
 	int flags;
 
 	if ((sdl = if_nametosdl(ifname)) == NULL) {
-		warnmsg(LOG_ERR, __FUNCTION__,
+		warnmsg(LOG_ERR, __func__,
 		       "failed to get link layer information for %s", ifname);
 		return(-1);
 	}
 	if (find_ifinfo(sdl->sdl_index)) {
-		warnmsg(LOG_ERR, __FUNCTION__,
+		warnmsg(LOG_ERR, __func__,
 			"interface %s was already configured", ifname);
 		free(sdl);
 		return(-1);
 	}
 
 	if ((ifinfo = malloc(sizeof(*ifinfo))) == NULL) {
-		warnmsg(LOG_ERR, __FUNCTION__, "memory allocation failed");
+		warnmsg(LOG_ERR, __func__, "memory allocation failed");
 		free(sdl);
 		return(-1);
 	}
@@ -435,7 +435,7 @@ make_packet(struct ifinfo *ifinfo)
 	size_t packlen = sizeof(struct nd_router_solicit), lladdroptlen = 0;
 
 	if ((lladdroptlen = lladdropt_length(ifinfo->sdl)) == 0) {
-		warnmsg(LOG_INFO, __FUNCTION__,
+		warnmsg(LOG_INFO, __func__,
 			"link-layer address option has null length"
 		       " on %s. Treat as not included.", ifinfo->ifname);
 	}
@@ -444,7 +444,7 @@ make_packet(struct ifinfo *ifinfo)
 
 	/* allocate buffer */
 	if ((buf = malloc(packlen)) == NULL) {
-		warnmsg(LOG_ERR, __FUNCTION__,
+		warnmsg(LOG_ERR, __func__,
 			"memory allocation failed for %s", ifinfo->ifname);
 		return(-1);
 	}
@@ -480,7 +480,7 @@ rtsol_check_timer()
 	for (ifinfo = iflist; ifinfo; ifinfo = ifinfo->next) {
 		if (TIMEVAL_LEQ(ifinfo->expire, now)) {
 			if (dflag > 1)
-				warnmsg(LOG_DEBUG, __FUNCTION__,
+				warnmsg(LOG_DEBUG, __func__,
 					"timer expiration on %s, "
 				       "state = %d", ifinfo->ifname,
 				       ifinfo->state);
@@ -506,7 +506,7 @@ rtsol_check_timer()
 					interface_status(ifinfo);
 
 				if (oldstatus != ifinfo->active) {
-					warnmsg(LOG_DEBUG, __FUNCTION__,
+					warnmsg(LOG_DEBUG, __func__,
 						"%s status is changed"
 						" from %d to %d",
 						ifinfo->ifname,
@@ -536,7 +536,7 @@ rtsol_check_timer()
 				if (ifinfo->probes < MAX_RTR_SOLICITATIONS)
 					sendpacket(ifinfo);
 				else {
-					warnmsg(LOG_INFO, __FUNCTION__,
+					warnmsg(LOG_INFO, __func__,
 						"No answer "
 						"after sending %d RSs",
 						ifinfo->probes);
@@ -553,7 +553,7 @@ rtsol_check_timer()
 	}
 
 	if (TIMEVAL_EQ(rtsol_timer, tm_max)) {
-		warnmsg(LOG_DEBUG, __FUNCTION__, "there is no timer");
+		warnmsg(LOG_DEBUG, __func__, "there is no timer");
 		return(NULL);
 	}
 	else if (TIMEVAL_LT(rtsol_timer, now))
@@ -563,7 +563,7 @@ rtsol_check_timer()
 		TIMEVAL_SUB(&rtsol_timer, &now, &returnval);
 
 	if (dflag > 1)
-		warnmsg(LOG_DEBUG, __FUNCTION__, "New timer is %ld:%08ld",
+		warnmsg(LOG_DEBUG, __func__, "New timer is %ld:%08ld",
 			(long)returnval.tv_sec, (long)returnval.tv_usec);
 
 	return(&returnval);
@@ -621,7 +621,7 @@ rtsol_timer_update(struct ifinfo *ifinfo)
 		}
 		break;
 	default:
-		warnmsg(LOG_ERR, __FUNCTION__,
+		warnmsg(LOG_ERR, __func__,
 			"illegal interface state(%d) on %s",
 			ifinfo->state, ifinfo->ifname);
 		return;
@@ -630,7 +630,7 @@ rtsol_timer_update(struct ifinfo *ifinfo)
 	/* reset the timer */
 	if (TIMEVAL_EQ(ifinfo->timer, tm_max)) {
 		ifinfo->expire = tm_max;
-		warnmsg(LOG_DEBUG, __FUNCTION__,
+		warnmsg(LOG_DEBUG, __func__,
 			"stop timer for %s", ifinfo->ifname);
 	}
 	else {
@@ -638,7 +638,7 @@ rtsol_timer_update(struct ifinfo *ifinfo)
 		TIMEVAL_ADD(&now, &ifinfo->timer, &ifinfo->expire);
 
 		if (dflag > 1)
-			warnmsg(LOG_DEBUG, __FUNCTION__,
+			warnmsg(LOG_DEBUG, __func__,
 				"set timer for %s to %d:%d", ifinfo->ifname,
 			       (int)ifinfo->timer.tv_sec,
 			       (int)ifinfo->timer.tv_usec);