From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E3650C33C99 for ; Tue, 7 Jan 2020 06:57:30 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id ADF12206DB for ; Tue, 7 Jan 2020 06:57:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="SC2HQJEI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ADF12206DB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:43312 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ioinv-0003jt-US for qemu-devel@archiver.kernel.org; Tue, 07 Jan 2020 01:57:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41176) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ioij7-0002fL-Km for qemu-devel@nongnu.org; Tue, 07 Jan 2020 01:52:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ioij4-0000kE-Qu for qemu-devel@nongnu.org; Tue, 07 Jan 2020 01:52:28 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:29238 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ioij4-0000jg-Hp for qemu-devel@nongnu.org; Tue, 07 Jan 2020 01:52:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578379945; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aykahNjZDwQr6O7Ei0t7rhjNWEhbVqEikab5BCotye8=; b=SC2HQJEIpC2pLdbUfkUlQrNn0K5qXFFmPFV/gM3I3fc/eXqN2+srL/5avpWKNps5pbFIya 4AfrMBFzUGRLaHLFFpguGun8V4m1mP/NkJTvNbiusv2xDqJ5O4Bf309d1Uuq0t3OQvZZnb fQNmD52rON7VqjXSg93V7WzqLOwBmUQ= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-156-AHhZywQgP6qhbuRC5BlUNw-1; Tue, 07 Jan 2020 01:52:22 -0500 Received: by mail-wm1-f69.google.com with SMTP id t4so3695523wmf.2 for ; Mon, 06 Jan 2020 22:52:21 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=JqPgKiAkWEI0E39h5UQ3TMbWYgbg0Sv3OYtBzBdsRIg=; b=J3Tf5owrR5XRtK/0oE0uei1IfmVGvhAPCKFPZd+mXMTI4GcC4PgqgDAkkj0ydQIRAd j3BLaOzcHbW02+MR+KGSIuR3C4Z1ybvHkKQJ/lhc1EdO4Pur7Nt1g/WOvg1fM0CD7IOO iK52/8Wz05F5PK7d/m9Mt8IyZWYcGkIu61OfytfIKy5LAEIi5U5dgRV+aZFcY2hvFTvH MjLCVAueNiMguegkUmz6YnCRiUjhr/HOE6Z9cPai58bJbyOnFDOPAXT4w05q35IbdOt1 tXfuCRVqO5ourXOAK5MGd11rAOISuTvkx+OvSRnZ1Fku9L1Pvh30HsO9k5m3Agt9SYXE ZyCw== X-Gm-Message-State: APjAAAUZ89MdfQzhKZNb9F6eXBH7IEB8b90on1xvuPK6ilW+D4DLWi5s x8Fha1V6FpNd0VkySqYQFmT8EssXmNZelI6kar3DWKII4TyhJdmQSC2G+EuGVFeG51S82DUQV0F VjXXZWtyGeSegvn4= X-Received: by 2002:adf:f28c:: with SMTP id k12mr105276917wro.360.1578379940896; Mon, 06 Jan 2020 22:52:20 -0800 (PST) X-Google-Smtp-Source: APXvYqyVETDi4s+cRglAdPIwST/e4qWPDGyxz1M0ut/YMdEy9mL/3vpmBDMm/CF362y1WY17iRnS9w== X-Received: by 2002:adf:f28c:: with SMTP id k12mr105276887wro.360.1578379940578; Mon, 06 Jan 2020 22:52:20 -0800 (PST) Received: from [192.168.1.35] (34.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.34]) by smtp.gmail.com with ESMTPSA id m7sm25343047wma.39.2020.01.06.22.52.19 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 06 Jan 2020 22:52:19 -0800 (PST) Subject: Re: [PATCH v1 10/59] chardev/char-win.c: remove 'fail' label in win_chr_serial_init() To: Daniel Henrique Barboza , qemu-devel@nongnu.org References: <20200106182425.20312-1-danielhb413@gmail.com> <20200106182425.20312-11-danielhb413@gmail.com> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Message-ID: Date: Tue, 7 Jan 2020 07:52:18 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 MIME-Version: 1.0 In-Reply-To: <20200106182425.20312-11-danielhb413@gmail.com> Content-Language: en-US X-MC-Unique: AHhZywQgP6qhbuRC5BlUNw-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, =?UTF-8?Q?Marc-Andr=c3=a9_Lureau?= , Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 1/6/20 7:23 PM, Daniel Henrique Barboza wrote: > The 'fail' label is a simply call to 'return -1' on error. Remove > it and do the return call instead. >=20 > CC: Marc-Andr=C3=A9 Lureau > CC: Paolo Bonzini > Signed-off-by: Daniel Henrique Barboza Reviewed-by: Philippe Mathieu-Daud=C3=A9 > --- > chardev/char-win.c | 19 ++++++++----------- > 1 file changed, 8 insertions(+), 11 deletions(-) >=20 > diff --git a/chardev/char-win.c b/chardev/char-win.c > index 34825f683d..72c232e6d9 100644 > --- a/chardev/char-win.c > +++ b/chardev/char-win.c > @@ -85,12 +85,12 @@ int win_chr_serial_init(Chardev *chr, const char *fil= ename, Error **errp) > s->hsend =3D CreateEvent(NULL, TRUE, FALSE, NULL); > if (!s->hsend) { > error_setg(errp, "Failed CreateEvent"); > - goto fail; > + return -1; > } > s->hrecv =3D CreateEvent(NULL, TRUE, FALSE, NULL); > if (!s->hrecv) { > error_setg(errp, "Failed CreateEvent"); > - goto fail; > + return -1; > } > =20 > s->file =3D CreateFile(filename, GENERIC_READ | GENERIC_WRITE, 0, N= ULL, > @@ -98,12 +98,12 @@ int win_chr_serial_init(Chardev *chr, const char *fil= ename, Error **errp) > if (s->file =3D=3D INVALID_HANDLE_VALUE) { > error_setg(errp, "Failed CreateFile (%lu)", GetLastError()); > s->file =3D NULL; > - goto fail; > + return -1; > } > =20 > if (!SetupComm(s->file, NRECVBUF, NSENDBUF)) { > error_setg(errp, "Failed SetupComm"); > - goto fail; > + return -1; > } > =20 > ZeroMemory(&comcfg, sizeof(COMMCONFIG)); > @@ -114,29 +114,26 @@ int win_chr_serial_init(Chardev *chr, const char *f= ilename, Error **errp) > =20 > if (!SetCommState(s->file, &comcfg.dcb)) { > error_setg(errp, "Failed SetCommState"); > - goto fail; > + return -1; > } > =20 > if (!SetCommMask(s->file, EV_ERR)) { > error_setg(errp, "Failed SetCommMask"); > - goto fail; > + return -1; > } > =20 > cto.ReadIntervalTimeout =3D MAXDWORD; > if (!SetCommTimeouts(s->file, &cto)) { > error_setg(errp, "Failed SetCommTimeouts"); > - goto fail; > + return -1; > } > =20 > if (!ClearCommError(s->file, &err, &comstat)) { > error_setg(errp, "Failed ClearCommError"); > - goto fail; > + return -1; > } > qemu_add_polling_cb(win_chr_serial_poll, chr); > return 0; > - > - fail: > - return -1; > } > =20 > int win_chr_pipe_poll(void *opaque) >=20