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/multi.c | |
| parent | bbe3aa9f881fa27fe828e3c9a36d6831f254a3ee (diff) | |
| download | curl-a304051620b92e12b6b1b4e19edc57b34ea332b6.tar.gz | |
lib: more conn->data cleanups
Closes #6479
Diffstat (limited to 'lib/multi.c')
| -rw-r--r-- | lib/multi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/multi.c b/lib/multi.c index 8d6d2cee1..5d4d45073 100644 --- a/lib/multi.c +++ b/lib/multi.c @@ -593,7 +593,7 @@ static CURLcode multi_done(struct Curl_easy *data, if(CURLE_ABORTED_BY_CALLBACK != result) { /* avoid this if we already aborted by callback to avoid this calling another callback */ - CURLcode rc = Curl_pgrsDone(conn); + CURLcode rc = Curl_pgrsDone(data); if(!result && rc) result = CURLE_ABORTED_BY_CALLBACK; } @@ -2069,7 +2069,7 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi, case CURLM_STATE_TOOFAST: /* limit-rate exceeded in either direction */ DEBUGASSERT(data->conn); /* if both rates are within spec, resume transfer */ - if(Curl_pgrsUpdate(data->conn)) + if(Curl_pgrsUpdate(data)) result = CURLE_ABORTED_BY_CALLBACK; else result = Curl_speedcheck(data, *nowp); @@ -2352,7 +2352,7 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi, rc = CURLM_CALL_MULTI_PERFORM; } /* if there's still a connection to use, call the progress function */ - else if(data->conn && Curl_pgrsUpdate(data->conn)) { + else if(data->conn && Curl_pgrsUpdate(data)) { /* aborted due to progress callback return code must close the connection */ result = CURLE_ABORTED_BY_CALLBACK; |