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 /tests/unit | |
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 'tests/unit')
-rw-r--r-- | tests/unit/unit1651.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/tests/unit/unit1651.c b/tests/unit/unit1651.c index 07e5b3f7a..fb013b4ed 100644 --- a/tests/unit/unit1651.c +++ b/tests/unit/unit1651.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2018 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2018 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -346,7 +346,6 @@ static unsigned char cert[] = { UNITTEST_START { CURLcode result; - struct connectdata conn; const char *beg = (const char *)&cert[0]; const char *end = (const char *)&cert[sizeof(cert)]; struct Curl_easy *data = curl_easy_init(); @@ -355,11 +354,7 @@ UNITTEST_START if(!data) return 2; - memset(&conn, 0, sizeof(struct connectdata)); - /* this is a lot of assuming, but we expect the parsing function to only - really need the easy handle pointer */ - conn.data = data; - result = Curl_extract_certinfo(&conn, 0, beg, end); + result = Curl_extract_certinfo(data, 0, beg, end); fail_unless(result == CURLE_OK, "Curl_extract_certinfo returned error"); @@ -369,7 +364,7 @@ UNITTEST_START for(i = 0; i < 45; i++) { char backup = cert[i]; cert[i] = (unsigned char) (byte & 0xff); - (void) Curl_extract_certinfo(&conn, 0, beg, end); + (void) Curl_extract_certinfo(data, 0, beg, end); cert[i] = backup; } } |