From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 29 Sep 2008 11:13:37 +0000 (+0000)
Subject: made Curl_read_plain() return an 'int' instead of CURLcode since it actually
X-Git-Tag: curl-7_19_1~271
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aff5408633230a7442553889c8e93f05900b8465;p=thirdparty%2Fcurl.git

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 79d34de60f..fc9af912ba 100644
--- 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 71ad6febd7..a1e60a88fa 100644
--- 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,