diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2021-01-08 17:58:15 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2021-01-17 23:56:09 +0100 |
| commit | 215db086e09665ee7af9b646ad6c4d6e281001ac (patch) | |
| tree | 50c74f8456df87e86de6d72e90190a3563083a1a /lib/transfer.h | |
| parent | 0d26ab9ed3ac29da2a383d313e93df3e9f5295a2 (diff) | |
| download | curl-215db086e09665ee7af9b646ad6c4d6e281001ac.tar.gz | |
lib: pass in 'struct Curl_easy *' to most functions
... in most cases instead of 'struct connectdata *' but in some cases in
addition to.
- We mostly operate on transfers and not connections.
- We need the transfer handle to log, store data and more. Everything in
libcurl is driven by a transfer (the CURL * in the public API).
- This work clarifies and separates the transfers from the connections
better.
- We should avoid "conn->data". Since individual connections can be used
by many transfers when multiplexing, making sure that conn->data
points to the current and correct transfer at all times is difficult
and has been notoriously error-prone over the years. The goal is to
ultimately remove the conn->data pointer for this reason.
Closes #6425
Diffstat (limited to 'lib/transfer.h')
| -rw-r--r-- | lib/transfer.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/transfer.h b/lib/transfer.h index f8915dbd1..fbcdcb9d0 100644 --- a/lib/transfer.h +++ b/lib/transfer.h @@ -23,7 +23,7 @@ ***************************************************************************/ #define Curl_headersep(x) ((((x)==':') || ((x)==';'))) -char *Curl_checkheaders(const struct connectdata *conn, +char *Curl_checkheaders(const struct Curl_easy *data, const char *thisheader); void Curl_init_CONNECT(struct Curl_easy *data); @@ -45,8 +45,8 @@ CURLcode Curl_follow(struct Curl_easy *data, char *newurl, CURLcode Curl_readwrite(struct connectdata *conn, struct Curl_easy *data, bool *done, bool *comeback); -int Curl_single_getsock(const struct connectdata *conn, - curl_socket_t *socks); +int Curl_single_getsock(struct Curl_easy *data, + struct connectdata *conn, curl_socket_t *socks); CURLcode Curl_readrewind(struct connectdata *conn); CURLcode Curl_fillreadbuffer(struct connectdata *conn, size_t bytes, size_t *nreadp); @@ -54,7 +54,7 @@ CURLcode Curl_retry_request(struct connectdata *conn, char **url); bool Curl_meets_timecondition(struct Curl_easy *data, time_t timeofdoc); CURLcode Curl_get_upload_buffer(struct Curl_easy *data); -CURLcode Curl_done_sending(struct connectdata *conn, +CURLcode Curl_done_sending(struct Curl_easy *data, struct SingleRequest *k); /* This sets up a forthcoming transfer */ |