aboutsummaryrefslogtreecommitdiff
path: root/tests/unit
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2019-01-02 18:04:58 +0100
committerDaniel Stenberg <daniel@haxx.se>2019-01-11 15:35:13 +0100
commitba243235ec04af62aee2cfc31bf0f05488e59fe7 (patch)
tree0f6584b31330f15dbbef48afefd00c1c51e686ea /tests/unit
parent61faa0b420c236480bc9ef6fd52b4ecc1e0f8d17 (diff)
urldata: rename easy_conn to just conn
We use "conn" everywhere to be a pointer to the connection. Introduces two functions that "attaches" and "detaches" the connection to and from the transfer. Going forward, we should favour using "data->conn" (since a transfer always only has a single connection or none at all) to "conn->data" (since a connection can have none, one or many transfers associated with it and updating conn->data to be correct is error prone and a frequent reason for internal issues). Closes #3442
Diffstat (limited to 'tests/unit')
-rw-r--r--tests/unit/unit1620.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/unit/unit1620.c b/tests/unit/unit1620.c
index a47ff49a4..b8b096521 100644
--- a/tests/unit/unit1620.c
+++ b/tests/unit/unit1620.c
@@ -48,7 +48,7 @@ UNITTEST_START
rc = Curl_open(&empty);
fail_unless(rc == CURLE_OK, "Curl_open() failed");
- rc = Curl_connect(empty, &empty->easy_conn, &async, &protocol_connect);
+ rc = Curl_connect(empty, &async, &protocol_connect);
fail_unless(rc == CURLE_URL_MALFORMAT,
"Curl_connect() failed to return CURLE_URL_MALFORMAT");
@@ -56,14 +56,14 @@ UNITTEST_START
"empty->magic should be equal to CURLEASY_MAGIC_NUMBER");
/* double invoke to ensure no dependency on internal state */
- rc = Curl_connect(empty, &empty->easy_conn, &async, &protocol_connect);
+ rc = Curl_connect(empty, &async, &protocol_connect);
fail_unless(rc == CURLE_URL_MALFORMAT,
"Curl_connect() failed to return CURLE_URL_MALFORMAT");
rc = Curl_init_userdefined(empty);
fail_unless(rc == CURLE_OK, "Curl_userdefined() failed");
- rc = Curl_init_do(empty, empty->easy_conn);
+ rc = Curl_init_do(empty, empty->conn);
fail_unless(rc == CURLE_OK, "Curl_init_do() failed");
rc = Curl_parse_login_details(
@@ -71,7 +71,7 @@ UNITTEST_START
fail_unless(rc == CURLE_OK,
"Curl_parse_login_details() failed");
- rc = Curl_disconnect(empty, empty->easy_conn, FALSE);
+ rc = Curl_disconnect(empty, empty->conn, FALSE);
fail_unless(rc == CURLE_OK,
"Curl_disconnect() with dead_connection set FALSE failed");