From patchwork Tue May 13 16:02:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 348426 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id B7860140079 for ; Wed, 14 May 2014 02:03:58 +1000 (EST) Received: from localhost ([::1]:46228 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WkFBM-0006sW-I2 for incoming@patchwork.ozlabs.org; Tue, 13 May 2014 12:03:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50521) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WkFAb-0005Rj-BU for qemu-devel@nongnu.org; Tue, 13 May 2014 12:03:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WkFAQ-0008GB-Om for qemu-devel@nongnu.org; Tue, 13 May 2014 12:03:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57458) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WkFAQ-0008Fi-G8 for qemu-devel@nongnu.org; Tue, 13 May 2014 12:02:58 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s4DG2urK005139 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 13 May 2014 12:02:57 -0400 Received: from blackfin.pond.sub.org (ovpn-116-42.ams2.redhat.com [10.36.116.42]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s4DG2sbY007726 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 13 May 2014 12:02:56 -0400 Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 8D6FD200D6; Tue, 13 May 2014 18:02:52 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 13 May 2014 18:02:39 +0200 Message-Id: <1399996972-23429-6-git-send-email-armbru@redhat.com> In-Reply-To: <1399996972-23429-1-git-send-email-armbru@redhat.com> References: <1399996972-23429-1-git-send-email-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, "Richard W.M. Jones" , stefanha@redhat.com Subject: [Qemu-devel] [PATCH 05/18] block/ssh: Drop superfluous libssh2_session_last_errno() calls X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org libssh2_session_last_error() already returns the error code. Cc: "Richard W.M. Jones" Signed-off-by: Markus Armbruster Reviewed-by: Richard W.M. Jones --- 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);