mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-04 16:45:24 +00:00
Code Issues Releases Wiki Activity

isc__strerror was being used incorrectly. Return value is the result and not a pointer to the error message

Browse Source
This commit is contained in:
Danny Mayer
2001-11-22 03:08:12 +00:00
parent acf6bcebf9
commit d67b892041
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/isc/win32/interfaceiter.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: interfaceiter.c,v 1.5 2001/09/04 03:22:19 mayer Exp $ */ /* $Id: interfaceiter.c,v 1.6 2001/11/22 03:08:12 mayer Exp $ */
/* /*
* Note that this code will need to be revisited to support IPv6 Interfaces. * Note that this code will need to be revisited to support IPv6 Interfaces.
@@ -123,9 +123,11 @@ isc_interfaceiter_create(isc_mem_t *mctx, isc_interfaceiter_t **iterp) {
* SIO_GET_INTERFACE_LIST WSAIoctl on. * SIO_GET_INTERFACE_LIST WSAIoctl on.
*/ */
if ((iter->socket = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { if ((iter->socket = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
error = WSAGetLastError();
isc__strerror(error, strbuf, sizeof(strbuf));
UNEXPECTED_ERROR(__FILE__, __LINE__, UNEXPECTED_ERROR(__FILE__, __LINE__,
"making interface scan socket: %s", "making interface scan socket: %s",
isc__strerror(errno, strbuf, sizeof(strbuf))); strbuf);
result = ISC_R_UNEXPECTED; result = ISC_R_UNEXPECTED;
goto socket_failure; goto socket_failure;
} }
@@ -145,16 +147,15 @@ isc_interfaceiter_create(isc_mem_t *mctx, isc_interfaceiter_t **iterp) {
if (WSAIoctl(iter->socket, SIO_GET_INTERFACE_LIST, if (WSAIoctl(iter->socket, SIO_GET_INTERFACE_LIST,
0, 0, iter->buf, iter->bufsize, 0, 0, iter->buf, iter->bufsize,
&bytesReturned, 0, 0) &bytesReturned, 0, 0) == SOCKET_ERROR)
== SOCKET_ERROR)
{ {
error = WSAGetLastError(); error = WSAGetLastError();
if (error != WSAEFAULT && error != WSAENOBUFS) { if (error != WSAEFAULT && error != WSAENOBUFS) {
errno = error; errno = error;
isc__strerror(error, strbuf, sizeof(strbuf));
UNEXPECTED_ERROR(__FILE__, __LINE__, UNEXPECTED_ERROR(__FILE__, __LINE__,
"get interface configuration: %s", "get interface configuration: %s",
isc__strerror(error,strbuf, strbuf);
sizeof(strbuf)));
result = ISC_R_UNEXPECTED; result = ISC_R_UNEXPECTED;
goto ioctl_failure; goto ioctl_failure;
} }