romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-24 13:43:32 +03:00
Code Issues Projects Releases Packages Wiki Activity

lib: reduce use of data->conn->

Browse source 
If there are more than two of them in a function, use a local 'conn'
variable instead.

Closes #19063
This commit is contained in:
Daniel Stenberg 2025-10-14 17:40:18 +02:00
parent 9441127394
commit ae5fb4188d
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
6 changed files with 62 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/vssh/libssh.c
View file

@ -1105,6 +1105,7 @@ static int myssh_in_AUTH_PASS(struct Curl_easy *data,
static int myssh_in_AUTH_DONE(struct Curl_easy *data,
struct ssh_conn *sshc)
{
struct connectdata *conn = data->conn;
if(!sshc->authed) {
failf(data, "Authentication failure");
return myssh_to_ERROR(data, sshc, CURLE_LOGIN_DENIED);
@ -1113,10 +1114,10 @@ static int myssh_in_AUTH_DONE(struct Curl_easy *data,
/* At this point we have an authenticated ssh session. */
infof(data, "Authentication complete");
Curl_pgrsTime(data, TIMER_APPCONNECT); /* SSH is connected */
data->conn->recv_idx = FIRSTSOCKET;
data->conn->send_idx = -1;
conn->recv_idx = FIRSTSOCKET;
conn->send_idx = -1;
if(data->conn->handler->protocol == CURLPROTO_SFTP) {
if(conn->handler->protocol == CURLPROTO_SFTP) {
myssh_to(data, sshc, SSH_SFTP_INIT);
return SSH_NO_ERROR;
}
@ -2428,14 +2429,15 @@ static CURLcode myssh_pollset(struct Curl_easy *data,
struct easy_pollset *ps)
{
int flags = 0;
if(data->conn->waitfor & KEEP_RECV)
struct connectdata *conn = data->conn;
if(conn->waitfor & KEEP_RECV)
flags |= CURL_POLL_IN;
if(data->conn->waitfor & KEEP_SEND)
if(conn->waitfor & KEEP_SEND)
flags |= CURL_POLL_OUT;
if(!data->conn->waitfor)
if(!conn->waitfor)
flags |= CURL_POLL_OUT;
return flags ?
Curl_pollset_change(data, ps, data->conn->sock[FIRSTSOCKET], flags, 0) :
Curl_pollset_change(data, ps, conn->sock[FIRSTSOCKET], flags, 0) :
CURLE_OK;
}