[GNUnet-SVN] [gnurl] 17/125: libssh: no need to call sftp_get_error as ssh_get_error is sufficient

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to branch master
in repository gnurl.

commit 8843c0939e99b3a89a505e7a2661a8bfd3a897ae
Author: Nikos Mavrogiannopoulos <address@hidden>
AuthorDate: Sun Dec 3 11:58:27 2017 +0100

    libssh: no need to call sftp_get_error as ssh_get_error is sufficient
    
    Fixes #2141
    
    Signed-off-by: Nikos Mavrogiannopoulos <address@hidden>
---
 lib/ssh-libssh.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/lib/ssh-libssh.c b/lib/ssh-libssh.c
index 8856d9044..d138959f3 100644
--- a/lib/ssh-libssh.c
+++ b/lib/ssh-libssh.c
@@ -896,7 +896,6 @@ static CURLcode myssh_statemach_act(struct connectdata 
*conn, bool *block)
       if(rc != 0 && !sshc->acceptfail) {
         Curl_safefree(sshc->quote_path1);
         Curl_safefree(sshc->quote_path2);
-        err = sftp_get_error(sshc->sftp_session);
         failf(data, "Attempt to set SFTP stats failed: %s",
               ssh_get_error(sshc->ssh_session));
         state(conn, SSH_SFTP_CLOSE);
@@ -916,7 +915,6 @@ static CURLcode myssh_statemach_act(struct connectdata 
*conn, bool *block)
       if(rc != 0 && !sshc->acceptfail) {
         Curl_safefree(sshc->quote_path1);
         Curl_safefree(sshc->quote_path2);
-        err = sftp_get_error(sshc->sftp_session);
         failf(data, "symlink command failed: %s",
               ssh_get_error(sshc->ssh_session));
         state(conn, SSH_SFTP_CLOSE);
@@ -932,7 +930,6 @@ static CURLcode myssh_statemach_act(struct connectdata 
*conn, bool *block)
                       (mode_t)data->set.new_directory_perms);
       if(rc != 0 && !sshc->acceptfail) {
         Curl_safefree(sshc->quote_path1);
-        err = sftp_get_error(sshc->sftp_session);
         failf(data, "mkdir command failed: %s",
               ssh_get_error(sshc->ssh_session));
         state(conn, SSH_SFTP_CLOSE);
@@ -949,7 +946,6 @@ static CURLcode myssh_statemach_act(struct connectdata 
*conn, bool *block)
       if(rc != 0 && !sshc->acceptfail) {
         Curl_safefree(sshc->quote_path1);
         Curl_safefree(sshc->quote_path2);
-        err = sftp_get_error(sshc->sftp_session);
         failf(data, "rename command failed: %s",
               ssh_get_error(sshc->ssh_session));
         state(conn, SSH_SFTP_CLOSE);
@@ -964,7 +960,6 @@ static CURLcode myssh_statemach_act(struct connectdata 
*conn, bool *block)
       rc = sftp_rmdir(sshc->sftp_session, sshc->quote_path1);
       if(rc != 0 && !sshc->acceptfail) {
         Curl_safefree(sshc->quote_path1);
-        err = sftp_get_error(sshc->sftp_session);
         failf(data, "rmdir command failed: %s",
               ssh_get_error(sshc->ssh_session));
         state(conn, SSH_SFTP_CLOSE);
@@ -979,7 +974,6 @@ static CURLcode myssh_statemach_act(struct connectdata 
*conn, bool *block)
       rc = sftp_unlink(sshc->sftp_session, sshc->quote_path1);
       if(rc != 0 && !sshc->acceptfail) {
         Curl_safefree(sshc->quote_path1);
-        err = sftp_get_error(sshc->sftp_session);
         failf(data, "rm command failed: %s",
               ssh_get_error(sshc->ssh_session));
         state(conn, SSH_SFTP_CLOSE);
@@ -997,9 +991,8 @@ static CURLcode myssh_statemach_act(struct connectdata 
*conn, bool *block)
       statvfs = sftp_statvfs(sshc->sftp_session, sshc->quote_path1);
       if(statvfs != 0 && !sshc->acceptfail) {
         Curl_safefree(sshc->quote_path1);
-        err = sftp_get_error(sshc->sftp_session);
-        failf(data, "statvfs command failed: %s (%d)",
-              ssh_get_error(sshc->ssh_session), err);
+        failf(data, "statvfs command failed: %s",
+              ssh_get_error(sshc->ssh_session));
         state(conn, SSH_SFTP_CLOSE);
         sshc->nextstate = SSH_NO_STATE;
         sshc->actualcode = CURLE_QUOTE_ERROR;

-- 
To stop receiving notification emails like this one, please contact
address@hidden