romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-16 08:37:18 +03:00
Code Issues Projects Releases Packages Wiki Activity

multi: remove the unused Curl_preconnect function

Browse source 
The implementation has been removed, no point in keeping it around.

Follow-up to 476adfeac0

Closes #13422
This commit is contained in:
Daniel Stenberg 2024-04-19 10:37:37 +02:00
parent fe226af174
commit 25236c6a80
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
3 changed files with 7 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lib/multi.c
View file

@ -1881,19 +1881,6 @@ static CURLcode protocol_connect(struct Curl_easy *data,
return result; /* pass back status */
}
/*
* Curl_preconnect() is called immediately before a connect starts. When a
* redirect is followed, this is then called multiple times during a single
* transfer.
*/
CURLcode Curl_preconnect(struct Curl_easy *data)
{
/* this used to do data->state.buffer allocation,
maybe remove completely now? */
(void)data;
return CURLE_OK;
}
static void set_in_callback(struct Curl_multi *multi, bool value)
{
multi->in_callback = value;
@ -1985,10 +1972,6 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
case MSTATE_CONNECT:
/* Connect. We want to get a connection identifier filled in. This state
can be entered from SETUP and from PENDING. */
result = Curl_preconnect(data);
if(result)
break;
result = Curl_connect(data, &async, &connected);
if(CURLE_NO_CONNECTION_AVAILABLE == result) {
/* There was no connection available. We will go to the pending

18
lib/url.c
View file

@ -3888,9 +3888,7 @@ CURLcode Curl_connect(struct Curl_easy *data,
CURLcode Curl_init_do(struct Curl_easy *data, struct connectdata *conn)
{
/* if this is a pushed stream, we need this: */
CURLcode result = Curl_preconnect(data);
if(result)
return result;
CURLcode result;
if(conn) {
conn->bits.do_more = FALSE; /* by default there's no curl_do_more() to
@ -3908,14 +3906,12 @@ CURLcode Curl_init_do(struct Curl_easy *data, struct connectdata *conn)
data->state.httpreq = HTTPREQ_HEAD;
result = Curl_req_start(&data->req, data);
if(result)
return result;
Curl_speedinit(data);
Curl_pgrsSetUploadCounter(data, 0);
Curl_pgrsSetDownloadCounter(data, 0);
return CURLE_OK;
if(!result) {
Curl_speedinit(data);
Curl_pgrsSetUploadCounter(data, 0);
Curl_pgrsSetDownloadCounter(data, 0);
}
return result;
}
#if defined(USE_HTTP2) || defined(USE_HTTP3)

4
lib/ws.c
View file

@ -950,10 +950,6 @@ CURL_EXTERN CURLcode curl_ws_recv(struct Curl_easy *data, void *buffer,
*nread = 0;
*metap = NULL;
/* get a download buffer */
result = Curl_preconnect(data);
if(result)
return result;
memset(&ctx, 0, sizeof(ctx));
ctx.data = data;