made Curl_read_plain() return an 'int' instead of CURLcode since it actually

returns -1 in EAGAIN cases and that's not valid CURLcode

diff --git a/lib/sendf.c b/lib/sendf.c
index 79d34de60f4ad4850776ff5bfc7f300083c8f632..fc9af912ba02749521b97ff3d14805a6e9afc6ab 100644 (file)
--- a/lib/sendf.c
+++ b/lib/sendf.c
@@ -534,7 +534,7 @@ CURLcode Curl_client_write(struct connectdata *conn,
   return CURLE_OK;
 }
 
-CURLcode Curl_read_plain(curl_socket_t sockfd,
+int Curl_read_plain(curl_socket_t sockfd,
                          char *buf,
                          size_t bytesfromsocket,
                          ssize_t *n)

diff --git a/lib/sendf.h b/lib/sendf.h
index 71ad6febd752b1ff2f63b3a392223963befbf53c..a1e60a88fac71afe6cbb5fb2d0ffab47c4c9d9c9 100644 (file)
--- a/lib/sendf.h
+++ b/lib/sendf.h
@@ -59,10 +59,10 @@ void Curl_read_rewind(struct connectdata *conn,
                       size_t extraBytesRead);
 
 /* internal read-function, does plain socket only */
-CURLcode Curl_read_plain(curl_socket_t sockfd,
-                         char *buf,
-                         size_t bytesfromsocket,
-                         ssize_t *n);
+int Curl_read_plain(curl_socket_t sockfd,
+                    char *buf,
+                    size_t bytesfromsocket,
+                    ssize_t *n);
 
 /* internal read-function, does plain socket, SSL and krb4 */
 int Curl_read(struct connectdata *conn, curl_socket_t sockfd,