From nobody Sun Feb 8 14:31:44 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=1626255971; cv=none; d=zohomail.com; s=zohoarc; b=fwkvXqsfLXqfhKoLfmMzKAuakPJcp5fdd31ogAXQtIYQ5+BOoS6cdAgPodxEwtMurC+0p0WhPRYNmqGIOal6UEnXlEqoLuGdgamMm+BCDGoC3SMmXNdQ34NPSBrSKTd8mxQoKhiiPfRp8pZ3xJuRkY25K+GEQWGZeJxNE67eGj4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626255971; 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=CqGW7DjGUA3pzyX7PaKEn4VA+qntPTnHNc8/rjlOT8M=; b=WsJQH6dx/rasewsPM9fyNl0VE9LHfKwlHyTHBVZfwodtFLLgAeVE9CVVrG6oOHHjV30ttrt8lyXDG3z5MqH2MToEKty0Bpzsxivfc4BCfZhJPYeeUUaNohW4uHC0i7cSuIyGU44n4C2+sasRTVR8kYilyvoCuWLoQw7wQrCQrs0= 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 1626255971546418.69536752713987; Wed, 14 Jul 2021 02:46:11 -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-417-mK6lIrRDOtu3ouassBeujA-1; Wed, 14 Jul 2021 05:46:08 -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 576E68030D7; Wed, 14 Jul 2021 09:46:03 +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 2EBFA26FA2; Wed, 14 Jul 2021 09:46:03 +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 EF8A31809CB3; Wed, 14 Jul 2021 09:46:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 16E9k1ZT001926 for ; Wed, 14 Jul 2021 05:46:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id F0F1718432; Wed, 14 Jul 2021 09:46:01 +0000 (UTC) Received: from work.redhat.com (ovpn-113-156.ams2.redhat.com [10.36.113.156]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8EFCE5D6D1; Wed, 14 Jul 2021 09:45:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626255970; 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=CqGW7DjGUA3pzyX7PaKEn4VA+qntPTnHNc8/rjlOT8M=; b=i9RtE7ed1DDI4HlLiEW4L01CxCnLN87pAugYQ7HQzdubCkvRi0jXu6SV3buGN2c1UGarPe S57PH+kHZJDcVceFKEGVeb20ZeUjOCvg+EqRho6qQlooCdMCGe7OYCrPfnj7lJyhD0kgTq Eo2pSieatls6EiwIaGhlXEoIqDmnkGQ= X-MC-Unique: mK6lIrRDOtu3ouassBeujA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 07/10] virNWFilterParseParamAttributes: Remove superfluous `goto`s Date: Wed, 14 Jul 2021 11:44:54 +0200 Message-Id: <20210714094457.61612-8-twiederh@redhat.com> In-Reply-To: <20210714094457.61612-1-twiederh@redhat.com> References: <20210714094457.61612-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: 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: 1626255972070100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- src/conf/nwfilter_params.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c index 63ab7e7150..35ea0256c3 100644 --- a/src/conf/nwfilter_params.c +++ b/src/conf/nwfilter_params.c @@ -710,28 +710,25 @@ virNWFilterParseParamAttributes(xmlNodePtr cur) =20 if (nam =3D=3D NULL || !isValidVarName(nam) || val =3D=3D NULL || !isValidVarValue(val)) { - goto skip_entry; + cur =3D xmlNextElementSibling(cur); + continue; } =20 if ((value =3D virHashLookup(table, nam))) { /* add value to existing value -> list */ if (virNWFilterVarValueAddValue(g_steal_pointer(&value), v= al) < 0) - goto err_exit; + return NULL; val =3D NULL; } else if ((value =3D virNWFilterParseVarValue(val))) { if (virHashUpdateEntry(table, nam, value) < 0) - goto err_exit; + return NULL; } value =3D NULL; - skip_entry: } cur =3D xmlNextElementSibling(cur); } =20 return g_steal_pointer(&table); - - err_exit: - return NULL; } =20 =20 --=20 2.31.1