]> granicus.if.org Git - curl/commitdiff
Curl_read_plain: clean up ifdefs that break statements
authorFlavio Medeiros <flaviomotamedeiros@gmail.com>
Sun, 29 Nov 2015 14:12:16 +0000 (11:12 -0300)
committerDaniel Stenberg <daniel@haxx.se>
Sun, 29 Nov 2015 23:28:28 +0000 (00:28 +0100)
Closes #546

lib/sendf.c

index 5f39d1f2d4268f02ca06227aa5dbb0191ed706a3..ea666e90febf3dc2038424610261a866da8293f4 100644 (file)
@@ -520,11 +520,13 @@ CURLcode Curl_read_plain(curl_socket_t sockfd,
 
   if(-1 == nread) {
     int err = SOCKERRNO;
+    int return_error;
 #ifdef USE_WINSOCK
-    if(WSAEWOULDBLOCK == err)
+    return_error = WSAEWOULDBLOCK == err;
 #else
-    if((EWOULDBLOCK == err) || (EAGAIN == err) || (EINTR == err))
+    return_error = EWOULDBLOCK == err || EAGAIN == err || EINTR == err;
 #endif
+    if(return_error)
       return CURLE_AGAIN;
     else
       return CURLE_RECV_ERROR;