From nobody Wed Apr 16 12:38:28 2025 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=1564389396; cv=none; d=zoho.com; s=zohoarc; b=ivCq/atbRJfc691NrsEAhdnfo4u9vReXvd/H8PtOmSEVkg7CBZTt1xasAqbLmAiVMzpGVX7kElbh2PhJLOW+v5Ejm2kO81OKWhnvv2MTwB6bbQOUp83vhi3Oz/ts15UvIOzPD7xYP8axSlhJ3qhtiVfAP03hnaxPQkUiis6CZEc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564389396; h=Content-Type: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=Tpw5UDr+1KV1Np94dxpKbqF1cgc+u43HV2IF9d87AHE=; b=ZAYNLzQ0nNgBia6p1UGd1aJxofB6Ed7wTIBgxf0oDjLeKxwlBaaFMDhW/IHIBUVEKTr1sKo+jFqol0w87LhCZ3//IHAGtWYTBwvHq54TPNoUmpVCKlYWS8BqwzUr7Cob6h4WAGE6OQ9U1662nW9uM9vAVsPtIgFWyGfjOvKOd3o= 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 1564389396250367.0823571305432; Mon, 29 Jul 2019 01:36:36 -0700 (PDT) Received: from localhost ([::1]:50486 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hs191-0008NJ-Ah for importer@patchew.org; Mon, 29 Jul 2019 04:36:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48035) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hs16U-0004Ts-DQ for qemu-devel@nongnu.org; Mon, 29 Jul 2019 04:34:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hs16T-0003HQ-GW for qemu-devel@nongnu.org; Mon, 29 Jul 2019 04:33:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33374) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hs16T-0003Ft-An for qemu-devel@nongnu.org; Mon, 29 Jul 2019 04:33:57 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3B5B883F4C; Mon, 29 Jul 2019 08:33:56 +0000 (UTC) Received: from jason-ThinkPad-T430s.redhat.com (ovpn-12-203.pek2.redhat.com [10.72.12.203]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6BFBE10190AA; Mon, 29 Jul 2019 08:33:54 +0000 (UTC) From: Jason Wang To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Mon, 29 Jul 2019 16:33:44 +0800 Message-Id: <1564389226-4489-4-git-send-email-jasowang@redhat.com> In-Reply-To: <1564389226-4489-1-git-send-email-jasowang@redhat.com> References: <1564389226-4489-1-git-send-email-jasowang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 29 Jul 2019 08:33:56 +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] [PULL 3/5] 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: Jason Wang , 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: Stefan Hajnoczi Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Li Qiang Signed-off-by: Jason Wang --- qemu-bridge-helper.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/qemu-bridge-helper.c b/qemu-bridge-helper.c index 2058e10..3d50ec0 100644 --- a/qemu-bridge-helper.c +++ b/qemu-bridge-helper.c @@ -102,9 +102,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; @@ -121,9 +119,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) { @@ -149,15 +145,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.5.0