[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 05/19] block/ssh: Drop superfluous libssh2_sessio
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v2 05/19] block/ssh: Drop superfluous libssh2_session_last_errno() calls |
Date: |
Fri, 16 May 2014 11:00:12 +0200 |
libssh2_session_last_error() already returns the error code.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Richard W.M. Jones <address@hidden>
---
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 <libssh2.h>. */
- 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 <libssh2.h>. */
- ssh_err_code = libssh2_session_last_errno((s)->session);
+ ssh_err_code = libssh2_session_last_error(s->session,
+ &ssh_err, NULL, 0);
/* See <libssh2_sftp.h>. */
sftp_err_code = libssh2_sftp_last_error((s)->sftp);
--
1.8.1.4
- [Qemu-devel] [PATCH v2 18/19] block/sheepdog: Fix silent sd_open(), sd_create() failures, (continued)
- [Qemu-devel] [PATCH v2 18/19] block/sheepdog: Fix silent sd_open(), sd_create() failures, Markus Armbruster, 2014/05/16
- [Qemu-devel] [PATCH v2 13/19] block/sheepdog: Propagate errors through get_sheep_fd(), Markus Armbruster, 2014/05/16
- [Qemu-devel] [PATCH v2 16/19] block/sheepdog: Propagate errors through find_vdi_name(), Markus Armbruster, 2014/05/16
- [Qemu-devel] [PATCH v2 11/19] block/vvfat: Propagate errors through init_directories(), Markus Armbruster, 2014/05/16
- [Qemu-devel] [PATCH v2 06/19] block/ssh: Propagate errors through check_host_key(), Markus Armbruster, 2014/05/16
- [Qemu-devel] [PATCH v2 01/19] blockdev: Don't use qerror_report_err() in drive_init(), Markus Armbruster, 2014/05/16
- [Qemu-devel] [PATCH v2 02/19] blockdev: Don't use qerror_report() in do_drive_del(), Markus Armbruster, 2014/05/16
- [Qemu-devel] [PATCH v2 03/19] qemu-nbd: Don't use qerror_report(), Markus Armbruster, 2014/05/16
- [Qemu-devel] [PATCH v2 10/19] block/vvfat: Propagate errors through enable_write_target(), Markus Armbruster, 2014/05/16
- [Qemu-devel] [PATCH v2 05/19] block/ssh: Drop superfluous libssh2_session_last_errno() calls,
Markus Armbruster <=
- Re: [Qemu-devel] [PATCH v2 00/19] block: Purge qerror_report(), Stefan Hajnoczi, 2014/05/23