summaryrefslogtreecommitdiff
path: root/lib/sendf.c
diff options
context:
space:
mode:
authorPatrick Monnerat <patrick@monnerat.net>2021-01-24 18:57:02 +0100
committerDaniel Stenberg <daniel@haxx.se>2021-01-26 15:19:41 +0100
commit234638ea63facf981d1070a4a980d0b289e16da0 (patch)
tree01a20de7097dcab052063f6672a3b1bdf6bf45f7 /lib/sendf.c
parent7173fe98ba153c6b148bbbf98c08a7ae5ce69f60 (diff)
downloadcurl-234638ea63facf981d1070a4a980d0b289e16da0.tar.gz
lib: remove conn->data uses
Closes #6515
Diffstat (limited to 'lib/sendf.c')
-rw-r--r--lib/sendf.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/sendf.c b/lib/sendf.c
index 5075c5439..b3c7fe33d 100644
--- a/lib/sendf.c
+++ b/lib/sendf.c
@@ -142,7 +142,8 @@ bool Curl_recv_has_postponed_data(struct connectdata *conn, int sockindex)
psnd->recv_size > psnd->recv_processed;
}
-static CURLcode pre_receive_plain(struct connectdata *conn, int num)
+static CURLcode pre_receive_plain(struct Curl_easy *data,
+ struct connectdata *conn, int num)
{
const curl_socket_t sockfd = conn->sock[num];
struct postponed_data * const psnd = &(conn->postponed[num]);
@@ -161,7 +162,7 @@ static CURLcode pre_receive_plain(struct connectdata *conn, int num)
/* Have some incoming data */
if(!psnd->buffer) {
/* Use buffer double default size for intermediate buffer */
- psnd->allocated_size = 2 * conn->data->set.buffer_size;
+ psnd->allocated_size = 2 * data->set.buffer_size;
psnd->buffer = malloc(psnd->allocated_size);
if(!psnd->buffer)
return CURLE_OUT_OF_MEMORY;
@@ -230,7 +231,7 @@ bool Curl_recv_has_postponed_data(struct connectdata *conn, int sockindex)
(void)sockindex;
return false;
}
-#define pre_receive_plain(c,n) CURLE_OK
+#define pre_receive_plain(d,c,n) CURLE_OK
#define get_pre_recved(c,n,b,l) 0
#endif /* ! USE_RECV_BEFORE_SEND_WORKAROUND */
@@ -347,7 +348,7 @@ ssize_t Curl_send_plain(struct Curl_easy *data, int num,
To avoid lossage of received data, recv() must be
performed before every send() if any incoming data is
available. */
- if(pre_receive_plain(conn, num)) {
+ if(pre_receive_plain(data, conn, num)) {
*code = CURLE_OUT_OF_MEMORY;
return -1;
}