From 30d16e2dfd9d5286fc62bab92a12ead868ac5b5f Mon Sep 17 00:00:00 2001 From: Bert Belder Date: Wed, 4 May 2011 00:27:24 +0200 Subject: [PATCH] Windows: pass test-bind-error-fault --- oio-win.c | 3 ++- test/test-bind-error.c | 2 +- test/test-list.h | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/oio-win.c b/oio-win.c index e9f1f54a..3d071088 100644 --- a/oio-win.c +++ b/oio-win.c @@ -247,6 +247,7 @@ static oio_err_code oio_translate_sys_error(int sys_errno) { case WSAEALREADY: return OIO_EALREADY; case ERROR_CONNECTION_REFUSED: return OIO_ECONNREFUSED; case WSAECONNREFUSED: return OIO_ECONNREFUSED; + case WSAEFAULT: return OIO_EFAULT; case WSAEINVAL: return OIO_EINVAL; case ERROR_TOO_MANY_OPEN_FILES: return OIO_EMFILE; case WSAEMFILE: return OIO_EMFILE; @@ -550,7 +551,7 @@ int oio_bind(oio_handle* handle, struct sockaddr* addr) { } else if (addr->sa_family == AF_INET6) { addrsize = sizeof(struct sockaddr_in6); } else { - assert(0); + oio_set_sys_error(WSAEFAULT); return -1; } diff --git a/test/test-bind-error.c b/test/test-bind-error.c index c1b7b9b9..afc6e891 100644 --- a/test/test-bind-error.c +++ b/test/test-bind-error.c @@ -124,7 +124,7 @@ TEST_IMPL(bind_error_addrnotavail_2) { } -TEST_IMPL(bind_error_fault_1) { +TEST_IMPL(bind_error_fault) { char garbage[] = "blah blah blah blah blah blah blah blah blah blah blah blah"; oio_handle server; int r; diff --git a/test/test-list.h b/test/test-list.h index 7ebf6d24..23708dba 100644 --- a/test/test-list.h +++ b/test/test-list.h @@ -25,7 +25,7 @@ TEST_DECLARE (tcp_writealot) TEST_DECLARE (bind_error_addrinuse) TEST_DECLARE (bind_error_addrnotavail_1) TEST_DECLARE (bind_error_addrnotavail_2) -TEST_DECLARE (bind_error_fault_1) +TEST_DECLARE (bind_error_fault) TEST_DECLARE (bind_error_inval) TEST_DECLARE (connection_fail) TEST_DECLARE (close_cb_stack) @@ -49,7 +49,7 @@ TASK_LIST_START TEST_ENTRY (bind_error_addrnotavail_2) - TEST_ENTRY (bind_error_fault_1) + TEST_ENTRY (bind_error_fault) TEST_ENTRY (bind_error_inval)