diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2021-01-18 11:56:50 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2021-01-19 09:14:51 +0100 |
| commit | a304051620b92e12b6b1b4e19edc57b34ea332b6 (patch) | |
| tree | 6611cb1f943e6eecebedd4fa19ec5d1716a38ccc /lib/pingpong.c | |
| parent | bbe3aa9f881fa27fe828e3c9a36d6831f254a3ee (diff) | |
| download | curl-a304051620b92e12b6b1b4e19edc57b34ea332b6.tar.gz | |
lib: more conn->data cleanups
Closes #6479
Diffstat (limited to 'lib/pingpong.c')
| -rw-r--r-- | lib/pingpong.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/pingpong.c b/lib/pingpong.c index 8ff394866..11d219125 100644 --- a/lib/pingpong.c +++ b/lib/pingpong.c @@ -117,7 +117,7 @@ CURLcode Curl_pp_statemach(struct Curl_easy *data, if(block) { /* if we didn't wait, we don't have to spend time on this now */ - if(Curl_pgrsUpdate(conn)) + if(Curl_pgrsUpdate(data)) result = CURLE_ABORTED_BY_CALLBACK; else result = Curl_speedcheck(data, Curl_now()); @@ -469,13 +469,14 @@ int Curl_pp_getsock(struct pingpong *pp, curl_socket_t *socks) return GETSOCK_READSOCK(0); } -CURLcode Curl_pp_flushsend(struct pingpong *pp) +CURLcode Curl_pp_flushsend(struct Curl_easy *data, + struct pingpong *pp) { /* we have a piece of a command still left to send */ struct connectdata *conn = pp->conn; ssize_t written; curl_socket_t sock = conn->sock[FIRSTSOCKET]; - CURLcode result = Curl_write(conn->data, sock, pp->sendthis + pp->sendsize - + CURLcode result = Curl_write(data, sock, pp->sendthis + pp->sendsize - pp->sendleft, pp->sendleft, &written); if(result) return result; |