Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from curl:master #315

Merged
merged 2 commits into from
Feb 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion lib/asyn-ares.c
Original file line number Diff line number Diff line change
Expand Up @@ -782,7 +782,6 @@ struct Curl_addrinfo *Curl_resolver_getaddrinfo(struct Curl_easy *data,
data->state.async.hostname = res->hostname;
data->state.async.port = port;
data->state.async.done = FALSE; /* not done */
data->state.async.status = 0; /* clear */
data->state.async.dns = NULL; /* clear */

/* initial status - failed */
Expand Down
1 change: 0 additions & 1 deletion lib/asyn-thread.c
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,6 @@ static bool init_resolve_thread(struct Curl_easy *data,

async->port = port;
async->done = FALSE;
async->status = 0;
async->dns = NULL;
td->thread_hnd = curl_thread_t_null;
td->start = Curl_now();
Expand Down
2 changes: 0 additions & 2 deletions lib/hostasyn.c
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,6 @@ CURLcode Curl_addrinfo_callback(struct Curl_easy *data,
struct Curl_dns_entry *dns = NULL;
CURLcode result = CURLE_OK;

data->state.async.status = status;

if(CURL_ASYNC_SUCCESS == status) {
if(ai) {
if(data->share)
Expand Down
1 change: 0 additions & 1 deletion lib/urldata.h
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,6 @@ struct Curl_async {
void *resolver; /* resolver state, if it is used in the URL state -
ares_channel e.g. */
int port;
int status; /* if done is TRUE, this is the status from the callback */
BIT(done); /* set TRUE when the lookup is complete */
};

Expand Down
1 change: 1 addition & 0 deletions lib/vquic/vquic.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
#include "vquic.h"
#include "vquic_int.h"
#include "strerror.h"
#include "strparse.h"

/* The last 3 #include files should be in this order */
#include "curl_printf.h"
Expand Down
1 change: 1 addition & 0 deletions lib/vssh/libssh.c
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
#include "parsedate.h" /* for the week day and month names */
#include "sockaddr.h" /* required for Curl_sockaddr_storage */
#include "strtoofft.h"
#include "strparse.h"
#include "multiif.h"
#include "select.h"
#include "warnless.h"
Expand Down
Loading