From aff5408633230a7442553889c8e93f05900b8465 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 29 Sep 2008 11:13:37 +0000 Subject: [PATCH] made Curl_read_plain() return an 'int' instead of CURLcode since it actually returns -1 in EAGAIN cases and that's not valid CURLcode --- lib/sendf.c | 2 +- lib/sendf.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/sendf.c b/lib/sendf.c index 79d34de60..fc9af912b 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 71ad6febd..a1e60a88f 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,