Module Name: src
Committed By: roy
Date: Fri Jun 5 15:41:59 UTC 2015
Modified Files:
src/usr.sbin/rtadvd: advcap.c if.c rrenum.c rtadvd.c
Log Message:
Use %m in syslog(3) instead of %s strerror(3).
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/rtadvd/advcap.c
cvs rdiff -u -r1.22 -r1.23 src/usr.sbin/rtadvd/if.c
cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/rtadvd/rrenum.c
cvs rdiff -u -r1.48 -r1.49 src/usr.sbin/rtadvd/rtadvd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/rtadvd/advcap.c
diff -u src/usr.sbin/rtadvd/advcap.c:1.14 src/usr.sbin/rtadvd/advcap.c:1.15
--- src/usr.sbin/rtadvd/advcap.c:1.14 Thu Dec 13 15:36:35 2012
+++ src/usr.sbin/rtadvd/advcap.c Fri Jun 5 15:41:59 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: advcap.c,v 1.14 2012/12/13 15:36:35 roy Exp $ */
+/* $NetBSD: advcap.c,v 1.15 2015/06/05 15:41:59 roy Exp $ */
/* $KAME: advcap.c,v 1.11 2003/05/19 09:46:50 keiichi Exp $ */
/*
@@ -136,8 +136,7 @@ getent(char *bp, char *name, char *cp)
tf = open(RM = cp, O_RDONLY);
}
if (tf < 0) {
- syslog(LOG_INFO,
- "<%s> open: %s", __func__, strerror(errno));
+ syslog(LOG_INFO, "<%s> open: %m", __func__);
return (-2);
}
for (;;) {
Index: src/usr.sbin/rtadvd/if.c
diff -u src/usr.sbin/rtadvd/if.c:1.22 src/usr.sbin/rtadvd/if.c:1.23
--- src/usr.sbin/rtadvd/if.c:1.22 Thu Dec 13 15:36:36 2012
+++ src/usr.sbin/rtadvd/if.c Fri Jun 5 15:41:59 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if.c,v 1.22 2012/12/13 15:36:36 roy Exp $ */
+/* $NetBSD: if.c,v 1.23 2015/06/05 15:41:59 roy Exp $ */
/* $KAME: if.c,v 1.36 2004/11/30 22:32:01 suz Exp $ */
/*
@@ -134,8 +134,7 @@ if_getflags(int ifindex, int oifflags)
int s;
if ((s = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
- syslog(LOG_ERR, "<%s> socket: %s", __func__,
- strerror(errno));
+ syslog(LOG_ERR, "<%s> socket: %m", __func__);
return (oifflags & ~IFF_UP);
}
Index: src/usr.sbin/rtadvd/rrenum.c
diff -u src/usr.sbin/rtadvd/rrenum.c:1.17 src/usr.sbin/rtadvd/rrenum.c:1.18
--- src/usr.sbin/rtadvd/rrenum.c:1.17 Fri Jun 5 14:09:20 2015
+++ src/usr.sbin/rtadvd/rrenum.c Fri Jun 5 15:41:59 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rrenum.c,v 1.17 2015/06/05 14:09:20 roy Exp $ */
+/* $NetBSD: rrenum.c,v 1.18 2015/06/05 15:41:59 roy Exp $ */
/* $KAME: rrenum.c,v 1.14 2004/06/14 05:36:00 itojun Exp $ */
/*
@@ -165,8 +165,7 @@ do_use_prefix(int len, struct rr_pco_mat
irr->irr_useprefix.sin6_addr = in6addr_any;
if (ioctl(s, rrcmd2pco[rpm->rpm_code], irr) < 0 &&
errno != EADDRNOTAVAIL)
- syslog(LOG_ERR, "<%s> ioctl: %s", __func__,
- strerror(errno));
+ syslog(LOG_ERR, "<%s> ioctl: %m", __func__);
return;
}
@@ -197,8 +196,7 @@ do_use_prefix(int len, struct rr_pco_mat
if (ioctl(s, rrcmd2pco[rpm->rpm_code], irr) < 0 &&
errno != EADDRNOTAVAIL)
- syslog(LOG_ERR, "<%s> ioctl: %s", __func__,
- strerror(errno));
+ syslog(LOG_ERR, "<%s> ioctl: %m", __func__);
/* very adhoc: should be rewritten */
if (rpm->rpm_code == RPM_PCO_CHANGE &&
@@ -252,8 +250,7 @@ do_pco(struct icmp6_router_renum *rr, in
return 1;
if (s == -1 && (s = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
- syslog(LOG_ERR, "<%s> socket: %s", __func__,
- strerror(errno));
+ syslog(LOG_ERR, "<%s> socket: %m", __func__);
exit(1);
}
@@ -283,8 +280,7 @@ do_pco(struct icmp6_router_renum *rr, in
if (errno == ENXIO)
return 0;
else if (errno) {
- syslog(LOG_ERR, "<%s> if_indextoname: %s", __func__,
- strerror(errno));
+ syslog(LOG_ERR, "<%s> if_indextoname: %m", __func__);
return 1;
}
return 0;
Index: src/usr.sbin/rtadvd/rtadvd.c
diff -u src/usr.sbin/rtadvd/rtadvd.c:1.48 src/usr.sbin/rtadvd/rtadvd.c:1.49
--- src/usr.sbin/rtadvd/rtadvd.c:1.48 Fri Jun 5 14:15:41 2015
+++ src/usr.sbin/rtadvd/rtadvd.c Fri Jun 5 15:41:59 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rtadvd.c,v 1.48 2015/06/05 14:15:41 roy Exp $ */
+/* $NetBSD: rtadvd.c,v 1.49 2015/06/05 15:41:59 roy Exp $ */
/* $KAME: rtadvd.c,v 1.92 2005/10/17 14:40:02 suz Exp $ */
/*
@@ -336,8 +336,7 @@ main(int argc, char *argv[])
{
/* EINTR would occur upon SIGUSR1 for status dump */
if (errno != EINTR)
- syslog(LOG_ERR, "<%s> poll: %s",
- __func__, strerror(errno));
+ syslog(LOG_ERR, "<%s> poll: %m", __func__);
continue;
}
if (i == 0) /* timeout */
@@ -1500,7 +1499,7 @@ sock_open(void)
CMSG_SPACE(sizeof(int));
rcvcmsgbuf = malloc(rcvcmsgbuflen);
if (rcvcmsgbuf == NULL) {
- syslog(LOG_ERR, "<%s> not enough core", __func__);
+ syslog(LOG_ERR, "<%s> malloc: %m", __func__);
exit(1);
}
@@ -1508,13 +1507,12 @@ sock_open(void)
CMSG_SPACE(sizeof(int));
sndcmsgbuf = malloc(sndcmsgbuflen);
if (sndcmsgbuf == NULL) {
- syslog(LOG_ERR, "<%s> not enough core", __func__);
+ syslog(LOG_ERR, "<%s> malloc: %m", __func__);
exit(1);
}
if ((sock = socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6)) < 0) {
- syslog(LOG_ERR, "<%s> socket: %s", __func__,
- strerror(errno));
+ syslog(LOG_ERR, "<%s> socket: %m", __func__);
exit(1);
}
@@ -1531,15 +1529,13 @@ sock_open(void)
#ifdef IPV6_RECVPKTINFO
if (setsockopt(sock, IPPROTO_IPV6, IPV6_RECVPKTINFO, &on,
sizeof(on)) < 0) {
- syslog(LOG_ERR, "<%s> IPV6_RECVPKTINFO: %s",
- __func__, strerror(errno));
+ syslog(LOG_ERR, "<%s> IPV6_RECVPKTINFO: %m", __func__);
exit(1);
}
#else /* old adv. API */
if (setsockopt(sock, IPPROTO_IPV6, IPV6_PKTINFO, &on,
sizeof(on)) < 0) {
- syslog(LOG_ERR, "<%s> IPV6_PKTINFO: %s",
- __func__, strerror(errno));
+ syslog(LOG_ERR, "<%s> IPV6_PKTINFO: %m", __func__);
exit(1);
}
#endif
@@ -1549,15 +1545,13 @@ sock_open(void)
#ifdef IPV6_RECVHOPLIMIT
if (setsockopt(sock, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, &on,
sizeof(on)) < 0) {
- syslog(LOG_ERR, "<%s> IPV6_RECVHOPLIMIT: %s",
- __func__, strerror(errno));
+ syslog(LOG_ERR, "<%s> IPV6_RECVHOPLIMIT: %m", __func__);
exit(1);
}
#else /* old adv. API */
if (setsockopt(sock, IPPROTO_IPV6, IPV6_HOPLIMIT, &on,
sizeof(on)) < 0) {
- syslog(LOG_ERR, "<%s> IPV6_HOPLIMIT: %s",
- __func__, strerror(errno));
+ syslog(LOG_ERR, "<%s> IPV6_HOPLIMIT: %m", __func__);
exit(1);
}
#endif
@@ -1569,8 +1563,7 @@ sock_open(void)
ICMP6_FILTER_SETPASS(ICMP6_ROUTER_RENUMBERING, &filt);
if (setsockopt(sock, IPPROTO_ICMPV6, ICMP6_FILTER, &filt,
sizeof(filt)) < 0) {
- syslog(LOG_ERR, "<%s> IICMP6_FILTER: %s",
- __func__, strerror(errno));
+ syslog(LOG_ERR, "<%s> IICMP6_FILTER: %m", __func__);
exit(1);
}
@@ -1588,8 +1581,8 @@ sock_open(void)
mreq.ipv6mr_interface = ra->ifindex;
if (setsockopt(sock, IPPROTO_IPV6, IPV6_JOIN_GROUP, &mreq,
sizeof(mreq)) < 0) {
- syslog(LOG_ERR, "<%s> IPV6_JOIN_GROUP(link) on %s: %s",
- __func__, ra->ifname, strerror(errno));
+ syslog(LOG_ERR, "<%s> IPV6_JOIN_GROUP(link) on %s: %m",
+ __func__, ra->ifname);
exit(1);
}
}
@@ -1620,10 +1613,9 @@ sock_open(void)
if (setsockopt(sock, IPPROTO_IPV6, IPV6_JOIN_GROUP,
&mreq, sizeof(mreq)) < 0) {
syslog(LOG_ERR,
- "<%s> IPV6_JOIN_GROUP(site) on %s: %s",
+ "<%s> IPV6_JOIN_GROUP(site) on %s: %m",
__func__,
- mcastif ? mcastif : ra->ifname,
- strerror(errno));
+ mcastif ? mcastif : ra->ifname);
exit(1);
}
}
@@ -1653,8 +1645,7 @@ static void
rtsock_open(void)
{
if ((rtsock = socket(PF_ROUTE, SOCK_RAW, 0)) < 0) {
- syslog(LOG_ERR,
- "<%s> socket: %s", __func__, strerror(errno));
+ syslog(LOG_ERR, "<%s> socket: %m", __func__);
exit(1);
}
}
@@ -1709,9 +1700,8 @@ ra_output(struct rainfo *rai)
if (i < 0 || (size_t)i != rai->ra_datalen) {
if (i < 0) {
- syslog(LOG_ERR, "<%s> sendmsg on %s: %s",
- __func__, rai->ifname,
- strerror(errno));
+ syslog(LOG_ERR, "<%s> sendmsg on %s: %m",
+ __func__, rai->ifname);
}
}
@@ -1727,9 +1717,8 @@ ra_output(struct rainfo *rai)
if (i < 0 || i != rai->ra_datalen) {
if (i < 0) {
syslog(LOG_ERR,
- "<%s> unicast sendmsg on %s: %s",
- __func__, rai->ifname,
- strerror(errno));
+ "<%s> unicast sendmsg on %s: %m",
+ __func__, rai->ifname);
}
}
#endif
