From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1ezNkX-0004OR-Si for mharc-qemu-trivial@gnu.org; Fri, 23 Mar 2018 10:32:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36516) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ezNkS-0004KY-VC for qemu-trivial@nongnu.org; Fri, 23 Mar 2018 10:32:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ezNkS-0003Kj-9F for qemu-trivial@nongnu.org; Fri, 23 Mar 2018 10:32:52 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:50644 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ezNk8-0003CJ-Os; Fri, 23 Mar 2018 10:32:32 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3D457EAEB8; Fri, 23 Mar 2018 14:32:32 +0000 (UTC) Received: from thinkpad.redhat.com (ovpn-204-35.brq.redhat.com [10.40.204.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5A3A52023233; Fri, 23 Mar 2018 14:32:25 +0000 (UTC) From: Laurent Vivier To: qemu-devel@nongnu.org Cc: Alexander Graf , "Michael S. Tsirkin" , qemu-block@nongnu.org, Paolo Bonzini , Fam Zheng , qemu-trivial@nongnu.org, Alberto Garcia , qemu-ppc@nongnu.org, Kevin Wolf , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Max Reitz , Max Filippov , "Dr. David Alan Gilbert" , Peter Crosthwaite , qemu-arm@nongnu.org, Yongbok Kim , Aurelien Jarno , Markus Armbruster , Jason Wang , Igor Mitsyanko , Eduardo Habkost , Eric Blake , David Gibson , Peter Maydell , Richard Henderson , Laurent Vivier Date: Fri, 23 Mar 2018 15:32:00 +0100 Message-Id: <20180323143202.28879-4-lvivier@redhat.com> In-Reply-To: <20180323143202.28879-1-lvivier@redhat.com> References: <20180323143202.28879-1-lvivier@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Fri, 23 Mar 2018 14:32:32 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Fri, 23 Mar 2018 14:32:32 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'lvivier@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-trivial] [PATCH v2 3/5] error: Remove NULL checks on error_propagate() calls X-BeenThere: qemu-trivial@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Mar 2018 14:32:56 -0000 Re-run Coccinelle patch scripts/coccinelle/error_propagate_null.cocci Signed-off-by: Laurent Vivier --- io/channel-websock.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/io/channel-websock.c b/io/channel-websock.c index ec48a305f0..e6608b969d 100644 --- a/io/channel-websock.c +++ b/io/channel-websock.c @@ -586,9 +586,7 @@ static gboolean qio_channel_websock_handshake_io(QIOChannel *ioc, return TRUE; } - if (err) { - error_propagate(&wioc->io_err, err); - } + error_propagate(&wioc->io_err, err); trace_qio_channel_websock_handshake_reply(ioc); qio_channel_add_watch( -- 2.14.3