From nobody Tue Feb 10 00:21:35 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1626189166; cv=none; d=zohomail.com; s=zohoarc; b=hKJ879xVnAB1HdA+++Mha1XaUJ06dwBhIp+fdcB6dUgFnkD/yU9Mr/uQBHbiyPxwHZUSFSpgx7RmEBDSAdzapFZvG6Wvr8PM9R0gps0CEa4NNQYTT54m61OlFYvklc2vNZJEy5WHW6INCrV/dISs6QN/ODkxZMlqbRkEP7r2ecc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626189166; 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; bh=HfjulMWMRCMdogHtCFsC/NuageQfnEIeupdPYmG/Io8=; b=Gfgv2dMDO8m+xu0L+shHfc0UoZp5Ikr3d+6tKtJMLa0Af3dyxH90ZKUhKrPUyo+cneYrEORM9TQPV/7G3++5ciRTLzmn39Tu0JM8l3dx1/TT3pZe6REDonPwkafS7YcVQUEfpaWecYHzRoi0OaAH24J1uQ6n7OsdppgTiJlHSmk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1626189166736705.6116808464832; Tue, 13 Jul 2021 08:12:46 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-261-gRvebMmRP7W3GzC6FksAyA-1; Tue, 13 Jul 2021 11:12:43 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 27C9B80430A; Tue, 13 Jul 2021 15:12:37 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F162C19C44; Tue, 13 Jul 2021 15:12:36 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id B74CB1832DBC; Tue, 13 Jul 2021 15:12:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 16DFCQ4A003668 for ; Tue, 13 Jul 2021 11:12:26 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3EE785C22B; Tue, 13 Jul 2021 15:12:26 +0000 (UTC) Received: from work.redhat.com (ovpn-113-139.ams2.redhat.com [10.36.113.139]) by smtp.corp.redhat.com (Postfix) with ESMTP id 61F405C22A; Tue, 13 Jul 2021 15:12:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626189165; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=HfjulMWMRCMdogHtCFsC/NuageQfnEIeupdPYmG/Io8=; b=DRdY4fXFqA8s20HQuGffws9pz3GxvKc246KdKhMHHBVAutfmQqmIE1BCtzRU1Iy8QG9Zlu /WRui7184HLsvdzmUqVkx3kQDEVXlEbf3LdMswZCm7q3Z0tvw8io1t0XMktr81tdoU2qO7 tlBJZGNJFq59YI4kJibHhr6GgUfXu0Q= X-MC-Unique: gRvebMmRP7W3GzC6FksAyA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 07/10] iptablesPrivateChainCreate: Remove superfluous `goto`s Date: Tue, 13 Jul 2021 17:12:09 +0200 Message-Id: <20210713151212.62582-8-twiederh@redhat.com> In-Reply-To: <20210713151212.62582-1-twiederh@redhat.com> References: <20210713151212.62582-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Peter Krempa , Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1626189167721100002 Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake Reviewed-by: Peter Krempa --- src/util/viriptables.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/util/viriptables.c b/src/util/viriptables.c index 847af9b9d7..721e1eeae7 100644 --- a/src/util/viriptables.c +++ b/src/util/viriptables.c @@ -73,14 +73,13 @@ iptablesPrivateChainCreate(virFirewall *fw, g_autoptr(GHashTable) chains =3D virHashNew(NULL); g_autoptr(GHashTable) links =3D virHashNew(NULL); const char *const *tmp; - int ret =3D -1; size_t i; =20 tmp =3D lines; while (tmp && *tmp) { if (STRPREFIX(*tmp, "-N ")) { /* eg "-N LIBVIRT_INP" */ if (virHashUpdateEntry(chains, *tmp + 3, (void *)0x1) < 0) - goto cleanup; + return -1; } else if (STRPREFIX(*tmp, "-A ")) { /* eg "-A INPUT -j LIBVIRT_IN= P" */ char *sep =3D strchr(*tmp + 3, ' '); if (sep) { @@ -88,7 +87,7 @@ iptablesPrivateChainCreate(virFirewall *fw, if (STRPREFIX(sep + 1, "-j ")) { if (virHashUpdateEntry(links, sep + 4, (char *)*tmp + 3) < 0) - goto cleanup; + return -1; } } } @@ -112,9 +111,7 @@ iptablesPrivateChainCreate(virFirewall *fw, "--jump", data->chains[i].child, NULL); } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 --=20 2.31.1