2004-11-19 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
* global: Replace strerror with safe_strerror. And vtysh/vtysh.c
needs to include "log.h" to pick up the declaration.
diff --git a/ripngd/ripng_interface.c b/ripngd/ripng_interface.c
index f5467f9..a7c9cef 100644
--- a/ripngd/ripng_interface.c
+++ b/ripngd/ripng_interface.c
@@ -94,7 +94,7 @@
}
if (ret < 0)
- zlog_warn ("can't setsockopt IPV6_JOIN_GROUP: %s", strerror (errno));
+ zlog_warn ("can't setsockopt IPV6_JOIN_GROUP: %s", safe_strerror (errno));
if (IS_RIPNG_DEBUG_EVENT)
zlog_info ("RIPng %s join to all-rip-routers multicast group", ifp->name);
@@ -120,7 +120,7 @@
ret = setsockopt (ripng->sock, IPPROTO_IPV6, IPV6_LEAVE_GROUP,
(char *) &mreq, sizeof (mreq));
if (ret < 0)
- zlog_warn ("can't setsockopt IPV6_LEAVE_GROUP: %s\n", strerror (errno));
+ zlog_warn ("can't setsockopt IPV6_LEAVE_GROUP: %s\n", safe_strerror (errno));
if (IS_RIPNG_DEBUG_EVENT)
zlog_info ("RIPng %s leave from all-rip-routers multicast group",
diff --git a/ripngd/ripngd.c b/ripngd/ripngd.c
index edf959f..5d5c25d 100644
--- a/ripngd/ripngd.c
+++ b/ripngd/ripngd.c
@@ -151,7 +151,7 @@
ret = bind (sock, (struct sockaddr *) &ripaddr, sizeof (ripaddr));
if (ret < 0)
{
- zlog (NULL, LOG_ERR, "Can't bind ripng socket: %s.", strerror (errno));
+ zlog (NULL, LOG_ERR, "Can't bind ripng socket: %s.", safe_strerror (errno));
if (ripngd_privs.change (ZPRIVS_LOWER))
zlog_err ("ripng_make_socket: could not lower privs");
return ret;
@@ -224,9 +224,9 @@
if (ret < 0) {
if (to)
zlog_err ("RIPng send fail on %s to %s: %s", ifp->name,
- inet6_ntop (&to->sin6_addr), strerror (errno));
+ inet6_ntop (&to->sin6_addr), safe_strerror (errno));
else
- zlog_err ("RIPng send fail on %s: %s", ifp->name, strerror (errno));
+ zlog_err ("RIPng send fail on %s: %s", ifp->name, safe_strerror (errno));
}
return ret;
@@ -1360,7 +1360,7 @@
&hoplimit);
if (len < 0)
{
- zlog_warn ("RIPng recvfrom failed: %s.", strerror (errno));
+ zlog_warn ("RIPng recvfrom failed: %s.", safe_strerror (errno));
return len;
}