From nobody Mon Feb 9 00:19:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1563879034; cv=none; d=zoho.com; s=zohoarc; b=Zh3iw/oORPPoMlt+U50vuKhWxpfUWH5Qiumvm67ZnyZoVHjYsNDAQuL34dIFTtM2k6oLHYWfHbPiYWfbzu/HSZr3sVpRYrjQuZsUEczeHC60ORF1htZpocWouvg02XIxXaKozAugrfPxX+2f/oJZAqmHhcSLxBaR4NfQdGRiTjE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563879034; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=jUg4SGMzJydKEKBk6MNhNiFkPvLC45uHCBv0IMsl9R4=; b=c6MjF8MoPm1xgudjDPjW46rb9Gun32MPJwFcdFGQmZJqtd4irW6RYwMG6umw4N9L6dOwxD5Q0fn5NUDIQzz3c1ZgdlShdLH+yOiynCcf6bhesWoVZ7U90CzdNfkQ387MfDu/VA9W8IKX/N70n2dauCKBn6Ue+r8o7pPQfpNQ1ls= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563879034404920.2188437039213; Tue, 23 Jul 2019 03:50:34 -0700 (PDT) Received: from localhost ([::1]:41200 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsNN-0007zb-7F for importer@patchew.org; Tue, 23 Jul 2019 06:50:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42621) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsN2-0006gB-1R for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:50:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hpsN0-0002wk-Ol for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:50:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43664) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hpsN0-0002wO-Im for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:50:10 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E02E1307D971; Tue, 23 Jul 2019 10:50:09 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.205.46]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6C48519C6A; Tue, 23 Jul 2019 10:50:07 +0000 (UTC) From: P J P To: QEMU Developers Date: Tue, 23 Jul 2019 16:17:53 +0530 Message-Id: <20190723104754.29324-3-ppandit@redhat.com> In-Reply-To: <20190723104754.29324-1-ppandit@redhat.com> References: <20190723104754.29324-1-ppandit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Tue, 23 Jul 2019 10:50:09 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v4 2/3] qemu-bridge-helper: move repeating code in parse_acl_file 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: Li Qiang , Jason Wang , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Prasad J Pandit Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Prasad J Pandit Move repeating error handling sequence in parse_acl_file routine to an 'err' label. Signed-off-by: Prasad J Pandit Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Li Qiang Reviewed-by: Stefan Hajnoczi --- qemu-bridge-helper.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) Reviewed v3: -> https://lists.nongnu.org/archive/html/qemu-devel/2019-07/msg00247.html diff --git a/qemu-bridge-helper.c b/qemu-bridge-helper.c index e90c22f07d..91a02f9611 100644 --- a/qemu-bridge-helper.c +++ b/qemu-bridge-helper.c @@ -92,9 +92,7 @@ static int parse_acl_file(const char *filename, ACLList *= acl_list) =20 if (arg =3D=3D NULL) { fprintf(stderr, "Invalid config line:\n %s\n", line); - fclose(f); - errno =3D EINVAL; - return -1; + goto err; } =20 *arg =3D 0; @@ -111,9 +109,7 @@ static int parse_acl_file(const char *filename, ACLList= *acl_list) =20 if (!g_str_equal(cmd, "include") && strlen(arg) >=3D IFNAMSIZ) { fprintf(stderr, "name `%s' too long: %zu\n", arg, strlen(arg)); - fclose(f); - errno =3D EINVAL; - return -1; + goto err; } =20 if (strcmp(cmd, "deny") =3D=3D 0) { @@ -139,15 +135,18 @@ static int parse_acl_file(const char *filename, ACLLi= st *acl_list) parse_acl_file(arg, acl_list); } else { fprintf(stderr, "Unknown command `%s'\n", cmd); - fclose(f); - errno =3D EINVAL; - return -1; + goto err; } } =20 fclose(f); - return 0; + +err: + fclose(f); + errno =3D EINVAL; + return -1; + } =20 static bool has_vnet_hdr(int fd) --=20 2.21.0