]> granicus.if.org Git - libevent/commitdiff
Fix from Chris Davis: get error-logging to be happy on win32.
authorNick Mathewson <nickm@torproject.org>
Tue, 27 Oct 2009 18:25:19 +0000 (18:25 +0000)
committerNick Mathewson <nickm@torproject.org>
Tue, 27 Oct 2009 18:25:19 +0000 (18:25 +0000)
svn:r1473

test/regress_util.c

index 4593a4328daa4a2597cc8214268202d437409b43..30ba0964e7e6b63f155c0f31e2cd93b09a4c4f40 100644 (file)
@@ -412,8 +412,9 @@ test_evutil_log(void *ptr)
        fd = socket(AF_INET, SOCK_STREAM, 0);
 #ifdef WIN32
        evutil_snprintf(buf, sizeof(buf),
-           "Unhappy socket: Resource temporarily unavailable");
-       EVUTIL_SET_SOCKET_ERROR(fd, WSAEWOULDBLOCK);
+           "Unhappy socket: %s",
+           evutil_socket_error_to_string(WSAEWOULDBLOCK));
+       EVUTIL_SET_SOCKET_ERROR(WSAEWOULDBLOCK);
 #else
        evutil_snprintf(buf, sizeof(buf),
            "Unhappy socket: %s", strerror(EAGAIN));
@@ -425,7 +426,7 @@ test_evutil_log(void *ptr)
        RESET();
 
 #ifdef WIN32
-       EVUTIL_SET_SOCKET_ERROR(fd, WSAEWOULDBLOCK);
+       EVUTIL_SET_SOCKET_ERROR(WSAEWOULDBLOCK);
 #else
        errno = EAGAIN;
 #endif