[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 19/33] block/ssh: Drop superfluous libssh2_session_la
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 19/33] block/ssh: Drop superfluous libssh2_session_last_errno() calls |
Date: |
Fri, 23 May 2014 17:41:51 +0200 |
From: Markus Armbruster <address@hidden>
libssh2_session_last_error() already returns the error code.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Richard W.M. Jones <address@hidden>
Signed-off-by: Stefan Hajnoczi <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.9.0
- [Qemu-devel] [PULL 08/33] block: Replace in_use with operation blocker, (continued)
- [Qemu-devel] [PULL 08/33] block: Replace in_use with operation blocker, Stefan Hajnoczi, 2014/05/23
- [Qemu-devel] [PULL 10/33] block: Add bdrv_set_backing_hd(), Stefan Hajnoczi, 2014/05/23
- [Qemu-devel] [PULL 11/33] block: Use bdrv_set_backing_hd everywhere, Stefan Hajnoczi, 2014/05/23
- [Qemu-devel] [PULL 12/33] block: Add backing_blocker in BlockDriverState, Stefan Hajnoczi, 2014/05/23
- [Qemu-devel] [PULL 13/33] block: Drop redundant bdrv_refresh_limits, Stefan Hajnoczi, 2014/05/23
- [Qemu-devel] [PULL 14/33] docs: Define refcount_bits value, Stefan Hajnoczi, 2014/05/23
- [Qemu-devel] [PULL 15/33] blockdev: Don't use qerror_report_err() in drive_init(), Stefan Hajnoczi, 2014/05/23
- [Qemu-devel] [PULL 16/33] blockdev: Don't use qerror_report() in do_drive_del(), Stefan Hajnoczi, 2014/05/23
- [Qemu-devel] [PULL 17/33] qemu-nbd: Don't use qerror_report(), Stefan Hajnoczi, 2014/05/23
- [Qemu-devel] [PULL 18/33] block/rbd: Propagate errors to open and create methods, Stefan Hajnoczi, 2014/05/23
- [Qemu-devel] [PULL 19/33] block/ssh: Drop superfluous libssh2_session_last_errno() calls,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 20/33] block/ssh: Propagate errors through check_host_key(), Stefan Hajnoczi, 2014/05/23
- [Qemu-devel] [PULL 21/33] block/ssh: Propagate errors through authenticate(), Stefan Hajnoczi, 2014/05/23
- [Qemu-devel] [PULL 23/33] block/ssh: Propagate errors to open and create methods, Stefan Hajnoczi, 2014/05/23
- [Qemu-devel] [PULL 24/33] block/vvfat: Propagate errors through enable_write_target(), Stefan Hajnoczi, 2014/05/23
- [Qemu-devel] [PULL 25/33] block/vvfat: Propagate errors through init_directories(), Stefan Hajnoczi, 2014/05/23
- [Qemu-devel] [PULL 26/33] block/sheepdog: Propagate errors through connect_to_sdog(), Stefan Hajnoczi, 2014/05/23
- [Qemu-devel] [PULL 27/33] block/sheepdog: Propagate errors through get_sheep_fd(), Stefan Hajnoczi, 2014/05/23
- [Qemu-devel] [PULL 28/33] block/sheepdog: Propagate errors through sd_prealloc(), Stefan Hajnoczi, 2014/05/23
- [Qemu-devel] [PULL 29/33] block/sheepdog: Propagate errors through do_sd_create(), Stefan Hajnoczi, 2014/05/23
- [Qemu-devel] [PULL 30/33] block/sheepdog: Propagate errors through find_vdi_name(), Stefan Hajnoczi, 2014/05/23