From ff25b453677bdf95fa66460bc7526532644625b5 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 3 Sep 2018 14:25:34 +0200 Subject: [PATCH] sftp: Reformat sftp_new() Signed-off-by: Andreas Schneider (cherry picked from commit 662c30eb723d47fd7773a546549413f5e856358a) --- src/sftp.c | 69 +++++++++++++++++++++++++++--------------------------- 1 file changed, 35 insertions(+), 34 deletions(-) diff --git a/src/sftp.c b/src/sftp.c index acb7c9db..fe182e43 100644 --- a/src/sftp.c +++ b/src/sftp.c @@ -92,52 +92,53 @@ static void sftp_ext_free(sftp_ext ext) { SAFE_FREE(ext); } -sftp_session sftp_new(ssh_session session){ - sftp_session sftp; +sftp_session sftp_new(ssh_session session) +{ + sftp_session sftp; - if (session == NULL) { - return NULL; - } + if (session == NULL) { + return NULL; + } - sftp = calloc(1, sizeof(struct sftp_session_struct)); - if (sftp == NULL) { - ssh_set_error_oom(session); + sftp = calloc(1, sizeof(struct sftp_session_struct)); + if (sftp == NULL) { + ssh_set_error_oom(session); - return NULL; - } + return NULL; + } - sftp->ext = sftp_ext_new(); - if (sftp->ext == NULL) { - ssh_set_error_oom(session); - SAFE_FREE(sftp); + sftp->ext = sftp_ext_new(); + if (sftp->ext == NULL) { + ssh_set_error_oom(session); + SAFE_FREE(sftp); - return NULL; - } + return NULL; + } - sftp->session = session; - sftp->channel = ssh_channel_new(session); - if (sftp->channel == NULL) { - sftp_ext_free(sftp->ext); - SAFE_FREE(sftp); + sftp->session = session; + sftp->channel = ssh_channel_new(session); + if (sftp->channel == NULL) { + sftp_ext_free(sftp->ext); + SAFE_FREE(sftp); - return NULL; - } + return NULL; + } - if (ssh_channel_open_session(sftp->channel)) { - ssh_channel_free(sftp->channel); - sftp_ext_free(sftp->ext); - SAFE_FREE(sftp); + if (ssh_channel_open_session(sftp->channel)) { + ssh_channel_free(sftp->channel); + sftp_ext_free(sftp->ext); + SAFE_FREE(sftp); - return NULL; - } + return NULL; + } - if (ssh_channel_request_sftp(sftp->channel)) { - sftp_free(sftp); + if (ssh_channel_request_sftp(sftp->channel)) { + sftp_free(sftp); - return NULL; - } + return NULL; + } - return sftp; + return sftp; } sftp_session sftp_new_channel(ssh_session session, ssh_channel channel){