Unverified Commit 14c95f81 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

ssh: fix Condition '!status' is always true 

in the same sftp_done function in both SSH backends. Simplify them
somewhat.

Pointed out by Codacy.

Closes #3628
parent 64d598d9

lib/ssh-libssh.c

+3 −7
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 2017 - 2018 Red Hat, Inc.

 * Copyright (C) 2017 - 2019 Red Hat, Inc.

 *

 * Authors: Nikos Mavrogiannopoulos, Tomas Mraz, Stanislav Zidek,

 *          Robert Kolcun, Andreas Schneider
@@ -2398,14 +2398,10 @@ static CURLcode sftp_done(struct connectdata *conn, CURLcode status, 
    /* Post quote commands are executed after the SFTP_CLOSE state to avoid

       errors that could happen due to open file handles during POSTQUOTE

       operation */

    if(!status && !premature && conn->data->set.postquote &&

       !conn->bits.retry) {

    if(!premature && conn->data->set.postquote && !conn->bits.retry)

      sshc->nextstate = SSH_SFTP_POSTQUOTE_INIT;

    state(conn, SSH_SFTP_CLOSE);

  }

    else

      state(conn, SSH_SFTP_CLOSE);

  }

  return myssh_done(conn, status);

}

lib/ssh.c

+3 −7
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -3222,14 +3222,10 @@ static CURLcode sftp_done(struct connectdata *conn, CURLcode status, 
    /* Post quote commands are executed after the SFTP_CLOSE state to avoid

       errors that could happen due to open file handles during POSTQUOTE

       operation */

    if(!status && !premature && conn->data->set.postquote &&

       !conn->bits.retry) {

    if(!premature && conn->data->set.postquote && !conn->bits.retry)

      sshc->nextstate = SSH_SFTP_POSTQUOTE_INIT;

    state(conn, SSH_SFTP_CLOSE);

  }

    else

      state(conn, SSH_SFTP_CLOSE);

  }

  return ssh_done(conn, status);

}