Pre-merge nits

diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index 79ffb0409df25178e1127d59fbdd520e15c78580..73d5bd3477639d9b531ad4837324b49be5741820 100644 (file)
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -2790,7 +2790,7 @@ opensocket(isc__socketmgr_t *manager, isc__socket_t *sock,
                                                  set_sndbuf) == ISC_R_SUCCESS);
                        if (setsockopt(sock->fd, SOL_SOCKET, SO_SNDBUF,
                               (void *)&sndbuf, sizeof(sndbuf)) == -1) {
-                               isc__strerror(errno, strbuf, sizeof(strbuf));
+                               strerror_r(errno, strbuf, sizeof(strbuf));
                                UNEXPECTED_ERROR(__FILE__, __LINE__,
                                        "setsockopt(%d, SO_SNDBUF, %d) %s: %s",
                                        sock->fd, sndbuf,