From nobody Wed Nov 5 16:38:16 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1496929513809372.8608838712952; Thu, 8 Jun 2017 06:45:13 -0700 (PDT) Received: from localhost ([::1]:49695 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIxkM-0007hg-0F for importer@patchew.org; Thu, 08 Jun 2017 09:45:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46861) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIxem-0001ji-Bq for qemu-devel@nongnu.org; Thu, 08 Jun 2017 09:39:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dIxel-0005VH-7r for qemu-devel@nongnu.org; Thu, 08 Jun 2017 09:39:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43844) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dIxek-0005Uf-Vn for qemu-devel@nongnu.org; Thu, 08 Jun 2017 09:39:23 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C988342BC9 for ; Thu, 8 Jun 2017 13:39:21 +0000 (UTC) Received: from localhost (ovpn-116-27.gru2.redhat.com [10.97.116.27]) by smtp.corp.redhat.com (Postfix) with ESMTP id C987C8E27C; Thu, 8 Jun 2017 13:39:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com C988342BC9 Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=ehabkost@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com C988342BC9 From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Thu, 8 Jun 2017 10:39:06 -0300 Message-Id: <20170608133906.12737-6-ehabkost@redhat.com> In-Reply-To: <20170608133906.12737-1-ehabkost@redhat.com> References: <20170608133906.12737-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 08 Jun 2017 13:39:21 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 5/5] vnc: No need for Error** parameter at vnc_client_io_error() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Markus Armbruster , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The only callers of vnc_client_io_error() with non-NULL errp don't use *errp after the function gets called, so there's no need to use an Error** argument. Change parameter to Error* and simplify the code. Cc: Gerd Hoffmann Cc: Daniel P. Berrange Signed-off-by: Eduardo Habkost Reviewed-by: Eric Blake --- ui/vnc.h | 2 +- ui/vnc.c | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/ui/vnc.h b/ui/vnc.h index 694cf32ca9..52f65bbd86 100644 --- a/ui/vnc.h +++ b/ui/vnc.h @@ -526,7 +526,7 @@ uint32_t read_u32(uint8_t *data, size_t offset); =20 /* Protocol stage functions */ void vnc_client_error(VncState *vs); -ssize_t vnc_client_io_error(VncState *vs, ssize_t ret, Error **errp); +ssize_t vnc_client_io_error(VncState *vs, ssize_t ret, Error *err); =20 void start_client_init(VncState *vs); void start_auth_vnc(VncState *vs); diff --git a/ui/vnc.c b/ui/vnc.c index 47b49c7318..51f13f0c29 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -1180,7 +1180,7 @@ void vnc_disconnect_finish(VncState *vs) g_free(vs); } =20 -ssize_t vnc_client_io_error(VncState *vs, ssize_t ret, Error **errp) +ssize_t vnc_client_io_error(VncState *vs, ssize_t ret, Error *err) { if (ret <=3D 0) { if (ret =3D=3D 0) { @@ -1188,14 +1188,11 @@ ssize_t vnc_client_io_error(VncState *vs, ssize_t r= et, Error **errp) vnc_disconnect_start(vs); } else if (ret !=3D QIO_CHANNEL_ERR_BLOCK) { VNC_DEBUG("Closing down client sock: ret %zd (%s)\n", - ret, errp ? error_get_pretty(*errp) : "Unknown"); + ret, err ? error_get_pretty(err) : "Unknown"); vnc_disconnect_start(vs); } =20 - if (errp) { - error_free(*errp); - *errp =3D NULL; - } + error_free(err); return 0; } return ret; @@ -1231,7 +1228,7 @@ ssize_t vnc_client_write_buf(VncState *vs, const uint= 8_t *data, size_t datalen) ret =3D qio_channel_write( vs->ioc, (const char *)data, datalen, &err); VNC_DEBUG("Wrote wire %p %zd -> %ld\n", data, datalen, ret); - return vnc_client_io_error(vs, ret, &err); + return vnc_client_io_error(vs, ret, err); } =20 =20 @@ -1344,7 +1341,7 @@ ssize_t vnc_client_read_buf(VncState *vs, uint8_t *da= ta, size_t datalen) ret =3D qio_channel_read( vs->ioc, (char *)data, datalen, &err); VNC_DEBUG("Read wire %p %zd -> %ld\n", data, datalen, ret); - return vnc_client_io_error(vs, ret, &err); + return vnc_client_io_error(vs, ret, err); } =20 =20 --=20 2.11.0.259.g40922b1