From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60790) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wnrch-0006BB-HA for qemu-devel@nongnu.org; Fri, 23 May 2014 11:43:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wnrca-0006Oq-2P for qemu-devel@nongnu.org; Fri, 23 May 2014 11:43:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37877) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WnrcZ-0006OP-QJ for qemu-devel@nongnu.org; Fri, 23 May 2014 11:43:00 -0400 From: Stefan Hajnoczi Date: Fri, 23 May 2014 17:41:51 +0200 Message-Id: <1400859725-31879-20-git-send-email-stefanha@redhat.com> In-Reply-To: <1400859725-31879-1-git-send-email-stefanha@redhat.com> References: <1400859725-31879-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 19/33] block/ssh: Drop superfluous libssh2_session_last_errno() calls List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Markus Armbruster , Stefan Hajnoczi From: Markus Armbruster libssh2_session_last_error() already returns the error code. Signed-off-by: Markus Armbruster Reviewed-by: Richard W.M. Jones Signed-off-by: Stefan Hajnoczi --- block/ssh.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/block/ssh.c b/block/ssh.c index aa63c9d..e38d232 100644 --- a/block/ssh.c +++ b/block/ssh.c @@ -121,10 +121,9 @@ session_error_report(BDRVSSHState *s, const char *fs, ...) char *ssh_err; int ssh_err_code; - libssh2_session_last_error((s)->session, &ssh_err, NULL, 0); /* This is not an errno. See . */ - ssh_err_code = libssh2_session_last_errno((s)->session); - + ssh_err_code = libssh2_session_last_error(s->session, + &ssh_err, NULL, 0); error_printf(": %s (libssh2 error code: %d)", ssh_err, ssh_err_code); } @@ -145,9 +144,9 @@ sftp_error_report(BDRVSSHState *s, const char *fs, ...) int ssh_err_code; unsigned long sftp_err_code; - libssh2_session_last_error((s)->session, &ssh_err, NULL, 0); /* This is not an errno. See . */ - ssh_err_code = libssh2_session_last_errno((s)->session); + ssh_err_code = libssh2_session_last_error(s->session, + &ssh_err, NULL, 0); /* See . */ sftp_err_code = libssh2_sftp_last_error((s)->sftp); -- 1.9.0