Kill __FUNCTION__.

ok itojun@

1 files changed, 20 insertions, 20 deletions

diff --git a/usr.sbin/rtadvd/rrenum.c b/usr.sbin/rtadvd/rrenum.c
index ed6aa47ccdb..6ef891bf395 100644
--- a/usr.sbin/rtadvd/rrenum.c
+++ b/usr.sbin/rtadvd/rrenum.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rrenum.c,v 1.9 2002/05/29 14:34:05 itojun Exp $	*/
+/*	$OpenBSD: rrenum.c,v 1.10 2002/06/10 19:57:35 espie Exp $	*/
 /*	$KAME: rrenum.c,v 1.11 2002/05/21 14:26:55 itojun Exp $	*/
 
 /*
@@ -85,7 +85,7 @@ rr_pco_check(int len, struct rr_pco_match *rpm)
 	if ((rpm->rpm_len - 3) < 0 || /* must be at least 3 */
 	    (rpm->rpm_len - 3) & 0x3) { /* must be multiple of 4 */
 		syslog(LOG_WARNING, "<%s> rpm_len %d is not 4N * 3",
-		       __FUNCTION__, rpm->rpm_len);
+		       __func__, rpm->rpm_len);
 		return 1;
 	}
 	/* rpm->rpm_code must be valid value */
@@ -95,14 +95,14 @@ rr_pco_check(int len, struct rr_pco_match *rpm)
 	case RPM_PCO_SETGLOBAL:
 		break;
 	default:
-		syslog(LOG_WARNING, "<%s> unknown rpm_code %d", __FUNCTION__,
+		syslog(LOG_WARNING, "<%s> unknown rpm_code %d", __func__,
 		       rpm->rpm_code);
 		return 1;
 	}
 	/* rpm->rpm_matchlen must be 0 to 128 inclusive */
 	if (rpm->rpm_matchlen > 128) {
 		syslog(LOG_WARNING, "<%s> rpm_matchlen %d is over 128",
-		       __FUNCTION__, rpm->rpm_matchlen);
+		       __func__, rpm->rpm_matchlen);
 		return 1;
 	}
 
@@ -126,7 +126,7 @@ rr_pco_check(int len, struct rr_pco_match *rpm)
 		if (checklen > 128) {
 			syslog(LOG_WARNING, "<%s> sum of rpu_uselen %d and"
 			       " rpu_keeplen %d is %d(over 128)",
-			       __FUNCTION__, rpu->rpu_uselen,
+			       __func__, rpu->rpu_uselen,
 			       rpu->rpu_keeplen,
 			       rpu->rpu_uselen + rpu->rpu_keeplen);
 			return 1;
@@ -162,7 +162,7 @@ do_use_prefix(int len, struct rr_pco_match *rpm,
 		irr->irr_useprefix.sin6_addr = in6addr_any;
 		if (ioctl(s, rrcmd2pco[rpm->rpm_code], (caddr_t)irr) < 0 &&
 		    errno != EADDRNOTAVAIL)
-			syslog(LOG_ERR, "<%s> ioctl: %s", __FUNCTION__,
+			syslog(LOG_ERR, "<%s> ioctl: %s", __func__,
 			       strerror(errno));
 		return;
 	}
@@ -194,7 +194,7 @@ do_use_prefix(int len, struct rr_pco_match *rpm,
 
 		if (ioctl(s, rrcmd2pco[rpm->rpm_code], (caddr_t)irr) < 0 &&
 		    errno != EADDRNOTAVAIL)
-			syslog(LOG_ERR, "<%s> ioctl: %s", __FUNCTION__,
+			syslog(LOG_ERR, "<%s> ioctl: %s", __func__,
 			       strerror(errno));
 
 		/* very adhoc: should be rewritten */
@@ -247,7 +247,7 @@ do_pco(struct icmp6_router_renum *rr, int len, struct rr_pco_match *rpm)
 		return 1;
 
 	if (s == -1 && (s = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
-		syslog(LOG_ERR, "<%s> socket: %s", __FUNCTION__,
+		syslog(LOG_ERR, "<%s> socket: %s", __func__,
 		       strerror(errno));
 		exit(1);
 	}
@@ -275,7 +275,7 @@ do_pco(struct icmp6_router_renum *rr, int len, struct rr_pco_match *rpm)
 	if (errno == ENXIO)
 		return 0;
 	else if (errno) {
-		syslog(LOG_ERR, "<%s> if_indextoname: %s", __FUNCTION__,
+		syslog(LOG_ERR, "<%s> if_indextoname: %s", __func__,
 		       strerror(errno));
 		return 1;
 	}
@@ -307,7 +307,7 @@ do_rr(int len, struct icmp6_router_renum *rr)
 		if (len < sizeof(struct rr_pco_match)) {
 		    tooshort:
 			syslog(LOG_ERR, "<%s> pkt too short. left len = %d. "
-			       "gabage at end of pkt?", __FUNCTION__, len);
+			       "gabage at end of pkt?", __func__, len);
 			return 1;
 		}
 		rpmlen = rpm->rpm_len << 3;
@@ -315,7 +315,7 @@ do_rr(int len, struct icmp6_router_renum *rr)
 			goto tooshort;
 
 		if (do_pco(rr, rpmlen, rpm)) {
-			syslog(LOG_WARNING, "<%s> invalid PCO", __FUNCTION__);
+			syslog(LOG_WARNING, "<%s> invalid PCO", __func__);
 			goto next;
 		}
 
@@ -342,7 +342,7 @@ rr_command_check(int len, struct icmp6_router_renum *rr, struct in6_addr *from,
 	if (len < (sizeof(struct icmp6_router_renum) +
 		   sizeof(struct rr_pco_match))) {
 		syslog(LOG_ERR,	"<%s> rr_command len %d is too short",
-		       __FUNCTION__, len);
+		       __func__, len);
 		return 1;
 	}
 
@@ -350,7 +350,7 @@ rr_command_check(int len, struct icmp6_router_renum *rr, struct in6_addr *from,
 	if (IN6_IS_ADDR_MULTICAST(dst) && !IN6_IS_ADDR_MC_LINKLOCAL(dst) &&
 	    !IN6_IS_ADDR_MC_SITELOCAL(dst)) {
 		syslog(LOG_ERR,	"<%s> dst mcast addr %s is illegal",
-		       __FUNCTION__,
+		       __func__,
 		       inet_ntop(AF_INET6, dst, ntopbuf, INET6_ADDRSTRLEN));
 		return 1;
 	}
@@ -359,7 +359,7 @@ rr_command_check(int len, struct icmp6_router_renum *rr, struct in6_addr *from,
 	if (rro.rro_seqnum > rr->rr_seqnum) {
 		syslog(LOG_WARNING,
 		       "<%s> rcvd old seqnum %d from %s",
-		       __FUNCTION__, (u_int32_t)ntohl(rr->rr_seqnum),
+		       __func__, (u_int32_t)ntohl(rr->rr_seqnum),
 		       inet_ntop(AF_INET6, from, ntopbuf, INET6_ADDRSTRLEN));
 		return 1;
 	}
@@ -369,7 +369,7 @@ rr_command_check(int len, struct icmp6_router_renum *rr, struct in6_addr *from,
 		if ((rr->rr_flags & ICMP6_RR_FLAGS_REQRESULT) != 0)
 			syslog(LOG_WARNING,
 			       "<%s> rcvd duped segnum %d from %s",
-			       __FUNCTION__, rr->rr_segnum,
+			       __func__, rr->rr_segnum,
 			       inet_ntop(AF_INET6, from, ntopbuf,
 					 INET6_ADDRSTRLEN));
 		return 0;
@@ -410,7 +410,7 @@ rr_command_input(int len, struct icmp6_router_renum *rr,
 	return;
 
     failed:
-	syslog(LOG_ERR, "<%s> received RR was invalid", __FUNCTION__);
+	syslog(LOG_ERR, "<%s> received RR was invalid", __func__);
 	return;
 }
 
@@ -422,7 +422,7 @@ rr_input(int len, struct icmp6_router_renum *rr, struct in6_pktinfo *pi,
 
 	syslog(LOG_DEBUG,
 	       "<%s> RR received from %s to %s on %s",
-	       __FUNCTION__,
+	       __func__,
 	       inet_ntop(AF_INET6, &from->sin6_addr,
 			 ntopbuf[0], INET6_ADDRSTRLEN),
 	       inet_ntop(AF_INET6, &dst, ntopbuf[1], INET6_ADDRSTRLEN),
@@ -432,7 +432,7 @@ rr_input(int len, struct icmp6_router_renum *rr, struct in6_pktinfo *pi,
 	if (len < sizeof(struct icmp6_router_renum)) {
 		syslog(LOG_NOTICE,
 		       "<%s>: RR short message (size %d) from %s to %s on %s",
-		       __FUNCTION__, len,
+		       __func__, len,
 		       inet_ntop(AF_INET6, &from->sin6_addr,
 				 ntopbuf[0], INET6_ADDRSTRLEN),
 		       inet_ntop(AF_INET6, &dst, ntopbuf[1], INET6_ADDRSTRLEN),
@@ -453,7 +453,7 @@ rr_input(int len, struct icmp6_router_renum *rr, struct in6_pktinfo *pi,
 		syslog(LOG_NOTICE,
 		       "<%s>: RR message with invalid destination (%s) "
 		       "from %s on %s",
-		       __FUNCTION__,
+		       __func__,
 		       inet_ntop(AF_INET6, &dst, ntopbuf[0], INET6_ADDRSTRLEN),
 		       inet_ntop(AF_INET6, &from->sin6_addr,
 				 ntopbuf[1], INET6_ADDRSTRLEN),
@@ -476,7 +476,7 @@ rr_input(int len, struct icmp6_router_renum *rr, struct in6_pktinfo *pi,
 		break;
 	default:
 		syslog(LOG_ERR,	"<%s> received unknown code %d",
-		       __FUNCTION__, rr->rr_code);
+		       __func__, rr->rr_code);
 		break;
 
 	}