threads are gone, replace thread safe isc__strerror() wrapper

with strerror() and drop it

ok millert florian

1 files changed, 13 insertions, 35 deletions

diff --git a/usr.bin/dig/lib/isc/unix/socket.c b/usr.bin/dig/lib/isc/unix/socket.c
index b3985ccbe7f..3c447ff7f22 100644
--- a/usr.bin/dig/lib/isc/unix/socket.c
+++ b/usr.bin/dig/lib/isc/unix/socket.c
@@ -37,7 +37,6 @@
 #include <isc/net.h>
 #include <isc/region.h>
 #include <isc/socket.h>
-#include <isc/strerror.h>
 #include <isc/task.h>
 #include <isc/util.h>
 
@@ -452,7 +451,6 @@ select_poke(isc__socketmgr_t *manager, int fd, int msg) {
 static isc_result_t
 make_nonblock(int fd) {
 	int ret;
-	char strbuf[ISC_STRERRORSIZE];
 	int flags;
 
 	flags = fcntl(fd, F_GETFL, 0);
@@ -460,11 +458,9 @@ make_nonblock(int fd) {
 	ret = fcntl(fd, F_SETFL, flags);
 
 	if (ret == -1) {
-		isc__strerror(errno, strbuf, sizeof(strbuf));
 		UNEXPECTED_ERROR(__FILE__, __LINE__,
 				 "fcntl(%d, F_SETFL, %d): %s", fd, flags,
-				 strbuf);
-
+				 strerror(errno));
 		return (ISC_R_UNEXPECTED);
 	}
 
@@ -727,13 +723,11 @@ build_msghdr_send(isc__socket_t *sock, char* cmsgbuf, isc_socketevent_t *dev,
 			if (setsockopt(sock->fd, IPPROTO_IP, IP_TOS,
 			       (void *)&dscp, sizeof(int)) < 0)
 			{
-				char strbuf[ISC_STRERRORSIZE];
-				isc__strerror(errno, strbuf, sizeof(strbuf));
 				UNEXPECTED_ERROR(__FILE__, __LINE__,
 						 "setsockopt(%d, IP_TOS, %.02x)"
 						 " %s: %s",
 						 sock->fd, dscp >> 2,
-						 "failed", strbuf);
+						 "failed", strerror(errno));
 			} else
 				sock->dscp = dscp;
 		}
@@ -752,13 +746,11 @@ build_msghdr_send(isc__socket_t *sock, char* cmsgbuf, isc_socketevent_t *dev,
 		} else if (sock->pf == AF_INET6 && sock->dscp != dev->dscp) {
 			if (setsockopt(sock->fd, IPPROTO_IPV6, IPV6_TCLASS,
 				       (void *)&dscp, sizeof(int)) < 0) {
-				char strbuf[ISC_STRERRORSIZE];
-				isc__strerror(errno, strbuf, sizeof(strbuf));
 				UNEXPECTED_ERROR(__FILE__, __LINE__,
 						 "setsockopt(%d, IPV6_TCLASS, "
 						 "%.02x) %s: %s",
 						 sock->fd, dscp >> 2,
-						 "failed", strbuf);
+						 "failed", strerror(errno));
 			} else
 				sock->dscp = dscp;
 		}
@@ -931,7 +923,6 @@ doio_recv(isc__socket_t *sock, isc_socketevent_t *dev) {
 	struct msghdr msghdr;
 	isc_buffer_t *buffer;
 	int recv_errno;
-	char strbuf[ISC_STRERRORSIZE];
 	char cmsgbuf[RECVCMSGBUFLEN] = {0};
 
 	build_msghdr_recv(sock, cmsgbuf, dev, &msghdr, iov, &read_count);
@@ -944,10 +935,10 @@ doio_recv(isc__socket_t *sock, isc_socketevent_t *dev) {
 			return (DOIO_SOFT);
 
 		if (isc_log_wouldlog(isc_lctx, IOEVENT_LEVEL)) {
-			isc__strerror(recv_errno, strbuf, sizeof(strbuf));
 			socket_log(sock, NULL, IOEVENT,
 				  "doio_recv: recvmsg(%d) %d bytes, err %d/%s",
-				   sock->fd, cc, recv_errno, strbuf);
+				   sock->fd, cc, recv_errno,
+				   strerror(recv_errno));
 		}
 
 #define SOFT_OR_HARD(_system, _isc) \
@@ -1088,7 +1079,6 @@ doio_send(isc__socket_t *sock, isc_socketevent_t *dev) {
 	char addrbuf[ISC_SOCKADDR_FORMATSIZE];
 	int attempts = 0;
 	int send_errno;
-	char strbuf[ISC_STRERRORSIZE];
 	char cmsgbuf[SENDCMSGBUFLEN] = {0};
 
 	build_msghdr_send(sock, cmsgbuf, dev, &msghdr, iov, &write_count);
@@ -1149,9 +1139,8 @@ doio_send(isc__socket_t *sock, isc_socketevent_t *dev) {
 		 * a status.
 		 */
 		isc_sockaddr_format(&dev->address, addrbuf, sizeof(addrbuf));
-		isc__strerror(send_errno, strbuf, sizeof(strbuf));
 		UNEXPECTED_ERROR(__FILE__, __LINE__, "internal_send: %s: %s",
-				 addrbuf, strbuf);
+				 addrbuf, strerror(send_errno));
 		dev->result = isc__errno2result(send_errno);
 		return (DOIO_HARD);
 	}
@@ -1341,7 +1330,6 @@ static isc_result_t
 opensocket(isc__socket_t *sock)
 {
 	isc_result_t result;
-	char strbuf[ISC_STRERRORSIZE];
 	const char *err = "socket";
 	int on = 1;
 
@@ -1358,10 +1346,9 @@ opensocket(isc__socket_t *sock)
 		switch (errno) {
 		case EMFILE:
 		case ENFILE:
-			isc__strerror(errno, strbuf, sizeof(strbuf));
 			isc_log_write(isc_lctx, ISC_LOGCATEGORY_GENERAL,
 				       ISC_LOGMODULE_SOCKET, ISC_LOG_ERROR,
-				       "%s: %s", err, strbuf);
+				       "%s: %s", err, strerror(errno));
 			/* fallthrough */
 		case ENOBUFS:
 			return (ISC_R_NORESOURCES);
@@ -1377,10 +1364,9 @@ opensocket(isc__socket_t *sock)
 			return (ISC_R_FAMILYNOSUPPORT);
 
 		default:
-			isc__strerror(errno, strbuf, sizeof(strbuf));
 			UNEXPECTED_ERROR(__FILE__, __LINE__,
 					 "%s() %s: %s", err, "failed",
-					 strbuf);
+					 strerror(errno));
 			return (ISC_R_UNEXPECTED);
 		}
 	}
@@ -1404,10 +1390,9 @@ opensocket(isc__socket_t *sock)
 		if (setsockopt(sock->fd, SOL_SOCKET, SO_TIMESTAMP,
 			       (void *)&on, sizeof(on)) < 0
 		    && errno != ENOPROTOOPT) {
-			isc__strerror(errno, strbuf, sizeof(strbuf));
 			UNEXPECTED_ERROR(__FILE__, __LINE__,
 					 "setsockopt(%d, SO_TIMESTAMP) %s: %s",
-					 sock->fd, "failed", strbuf);
+					 sock->fd, "failed", strerror(errno));
 			/* Press on... */
 		}
 
@@ -1415,11 +1400,10 @@ opensocket(isc__socket_t *sock)
 		if ((sock->pf == AF_INET6)
 		    && (setsockopt(sock->fd, IPPROTO_IPV6, IPV6_RECVPKTINFO,
 				   (void *)&on, sizeof(on)) < 0)) {
-			isc__strerror(errno, strbuf, sizeof(strbuf));
 			UNEXPECTED_ERROR(__FILE__, __LINE__,
 					 "setsockopt(%d, IPV6_RECVPKTINFO) "
 					 "%s: %s", sock->fd, "failed",
-					 strbuf);
+					 strerror(errno));
 		}
 	}
 
@@ -2300,7 +2284,6 @@ isc_result_t
 isc__socket_bind(isc_socket_t *sock0, isc_sockaddr_t *sockaddr,
 		 unsigned int options) {
 	isc__socket_t *sock = (isc__socket_t *)sock0;
-	char strbuf[ISC_STRERRORSIZE];
 	int on = 1;
 
 	REQUIRE(VALID_SOCKET(sock));
@@ -2333,9 +2316,8 @@ isc__socket_bind(isc_socket_t *sock0, isc_sockaddr_t *sockaddr,
 		case EINVAL:
 			return (ISC_R_BOUND);
 		default:
-			isc__strerror(errno, strbuf, sizeof(strbuf));
 			UNEXPECTED_ERROR(__FILE__, __LINE__, "bind: %s",
-					 strbuf);
+					 strerror(errno));
 			return (ISC_R_UNEXPECTED);
 		}
 	}
@@ -2355,7 +2337,6 @@ isc__socket_connect(isc_socket_t *sock0, isc_sockaddr_t *addr,
 	isc_task_t *ntask = NULL;
 	isc__socketmgr_t *manager;
 	int cc;
-	char strbuf[ISC_STRERRORSIZE];
 	char addrbuf[ISC_SOCKADDR_FORMATSIZE];
 
 	REQUIRE(VALID_SOCKET(sock));
@@ -2419,10 +2400,9 @@ isc__socket_connect(isc_socket_t *sock0, isc_sockaddr_t *addr,
 
 		sock->connected = 0;
 
-		isc__strerror(errno, strbuf, sizeof(strbuf));
 		isc_sockaddr_format(addr, addrbuf, sizeof(addrbuf));
 		UNEXPECTED_ERROR(__FILE__, __LINE__, "connect(%s) %d/%s",
-				 addrbuf, errno, strbuf);
+				 addrbuf, errno, strerror(errno));
 
 		isc_event_free(ISC_EVENT_PTR(&dev));
 		return (ISC_R_UNEXPECTED);
@@ -2481,7 +2461,6 @@ internal_connect(isc_task_t *me, isc_event_t *ev) {
 	isc_task_t *task;
 	int cc;
 	socklen_t optlen;
-	char strbuf[ISC_STRERRORSIZE];
 	char peerbuf[ISC_SOCKADDR_FORMATSIZE];
 
 	UNUSED(me);
@@ -2558,10 +2537,9 @@ internal_connect(isc_task_t *me, isc_event_t *ev) {
 			dev->result = ISC_R_UNEXPECTED;
 			isc_sockaddr_format(&sock->peer_address, peerbuf,
 					    sizeof(peerbuf));
-			isc__strerror(errno, strbuf, sizeof(strbuf));
 			UNEXPECTED_ERROR(__FILE__, __LINE__,
 					 "internal_connect: connect(%s) %s",
-					 peerbuf, strbuf);
+					 peerbuf, strerror(errno));
 		}
 	} else {
 		dev->result = ISC_R_SUCCESS;