From 91278dec41a8ff16e1cbe44d52d66b5b3eaa8631 Mon Sep 17 00:00:00 2001 From: Eshan Kelkar Date: Fri, 23 May 2025 20:53:17 +0530 Subject: [PATCH] libssh: Rename struct ssh_con member sftp_aio to sftp_send_aio Renamed sftp_aio -> sftp_send_aio to highlight its association with sftp_send() (This is consistent with how sftp_send_state, associated with sftp_send() has been named) Signed-off-by: Eshan Kelkar --- lib/vssh/libssh.c | 16 ++++++++-------- lib/vssh/ssh.h | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/vssh/libssh.c b/lib/vssh/libssh.c index 4a272e4535..f433f7eaab 100644 --- a/lib/vssh/libssh.c +++ b/lib/vssh/libssh.c @@ -1460,9 +1460,9 @@ static int myssh_in_SFTP_SHUTDOWN(struct Curl_easy *data, before we proceed */ ssh_set_blocking(sshc->ssh_session, 0); #if LIBSSH_VERSION_INT > SSH_VERSION_INT(0, 11, 0) - if(sshc->sftp_aio) { - sftp_aio_free(sshc->sftp_aio); - sshc->sftp_aio = NULL; + if(sshc->sftp_send_aio) { + sftp_aio_free(sshc->sftp_send_aio); + sshc->sftp_send_aio = NULL; } #endif @@ -3035,21 +3035,21 @@ static CURLcode sftp_send(struct Curl_easy *data, int sockindex, case 0: sftp_file_set_nonblocking(sshc->sftp_file); if(sftp_aio_begin_write(sshc->sftp_file, mem, len, - &sshc->sftp_aio) == SSH_ERROR) { + &sshc->sftp_send_aio) == SSH_ERROR) { return CURLE_SEND_ERROR; } sshc->sftp_send_state = 1; FALLTHROUGH(); case 1: - nwrite = sftp_aio_wait_write(&sshc->sftp_aio); + nwrite = sftp_aio_wait_write(&sshc->sftp_send_aio); myssh_block2waitfor(conn, sshc, (nwrite == SSH_AGAIN) ? TRUE : FALSE); if(nwrite == SSH_AGAIN) return CURLE_AGAIN; else if(nwrite < 0) return CURLE_SEND_ERROR; - if(sshc->sftp_aio) { - sftp_aio_free(sshc->sftp_aio); - sshc->sftp_aio = NULL; + if(sshc->sftp_send_aio) { + sftp_aio_free(sshc->sftp_send_aio); + sshc->sftp_send_aio = NULL; } sshc->sftp_send_state = 0; *pnwritten = (size_t)nwrite; diff --git a/lib/vssh/ssh.h b/lib/vssh/ssh.h index 4056c39b20..89bc051c7c 100644 --- a/lib/vssh/ssh.h +++ b/lib/vssh/ssh.h @@ -180,7 +180,7 @@ struct ssh_conn { unsigned sftp_recv_state; /* 0 or 1 */ #if LIBSSH_VERSION_INT > SSH_VERSION_INT(0, 11, 0) - sftp_aio sftp_aio; + sftp_aio sftp_send_aio; unsigned sftp_send_state; /* 0 or 1 */ #endif int sftp_file_index; /* for async read */