lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-12-11 03:42:35 +03:00
Code Activity

sftp.c: Reformat sftp_init() according to the current coding style

Browse Source 
Signed-off-by:  Eshan Kelkar <eshankelkar@galorithm.com>
Reviewed-by: Jakub Jelen <jjelen@redhat.com>
This commit is contained in:
Eshan Kelkar
2023-12-06 11:39:35 +05:30
committed by Jakub Jelen
parent 99e8f34142
commit 63ee84862b
1 changed files with 90 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/sftp.c
View File

@@ -414,7 +414,8 @@ int sftp_get_error(sftp_session sftp) {
} }
/* Initialize the sftp session with the server. */ /* Initialize the sftp session with the server. */
int sftp_init(sftp_session sftp) { int sftp_init(sftp_session sftp)
{
sftp_packet packet = NULL; sftp_packet packet = NULL;
ssh_buffer buffer = NULL; ssh_buffer buffer = NULL;
char *ext_name = NULL; char *ext_name = NULL;
@@ -436,10 +437,13 @@ int sftp_init(sftp_session sftp) {
sftp_set_error(sftp, SSH_FX_FAILURE); sftp_set_error(sftp, SSH_FX_FAILURE);
return -1; return -1;
} }
if (sftp_packet_write(sftp, SSH_FXP_INIT, buffer) < 0) {
rc = sftp_packet_write(sftp, SSH_FXP_INIT, buffer);
if (rc == SSH_ERROR) {
SSH_BUFFER_FREE(buffer); SSH_BUFFER_FREE(buffer);
return -1; return -1;
} }
SSH_BUFFER_FREE(buffer); SSH_BUFFER_FREE(buffer);
packet = sftp_packet_read(sftp); packet = sftp_packet_read(sftp);
@@ -449,7 +453,8 @@ int sftp_init(sftp_session sftp) {
if (packet->type != SSH_FXP_VERSION) { if (packet->type != SSH_FXP_VERSION) {
ssh_set_error(sftp->session, SSH_FATAL, ssh_set_error(sftp->session, SSH_FATAL,
"Received a %d messages instead of SSH_FXP_VERSION", packet->type); "Received a %d messages instead of SSH_FXP_VERSION",
packet->type);
return -1; return -1;
} }
@@ -459,6 +464,7 @@ int sftp_init(sftp_session sftp) {
sftp_set_error(sftp, SSH_FX_FAILURE); sftp_set_error(sftp, SSH_FX_FAILURE);
return -1; return -1;
} }
SSH_LOG(SSH_LOG_DEBUG, SSH_LOG(SSH_LOG_DEBUG,
"SFTP server version %" PRIu32, "SFTP server version %" PRIu32,
version); version);
@@ -485,6 +491,7 @@ int sftp_init(sftp_session sftp) {
sftp_set_error(sftp, SSH_FX_FAILURE); sftp_set_error(sftp, SSH_FX_FAILURE);
return -1; return -1;
} }
tmp[count - 1] = ext_name; tmp[count - 1] = ext_name;
sftp->ext->name = tmp; sftp->ext->name = tmp;
@@ -496,6 +503,7 @@ int sftp_init(sftp_session sftp) {
sftp_set_error(sftp, SSH_FX_FAILURE); sftp_set_error(sftp, SSH_FX_FAILURE);
return -1; return -1;
} }
tmp[count - 1] = ext_data; tmp[count - 1] = ext_data;
sftp->ext->data = tmp; sftp->ext->data = tmp;
@@ -506,7 +514,6 @@ int sftp_init(sftp_session sftp) {
sftp->version = sftp->server_version = (int)version; sftp->version = sftp->server_version = (int)version;
return 0; return 0;
} }