From nobody Mon Feb 9 02:08:02 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1685705346; cv=none; d=zohomail.com; s=zohoarc; b=Mo8X1VmBnshKevaYQ+mnd8hazItGyqnE7xFEpxkcnos00bRIDVwBH7fu0+X+xCxQHUbRiYZr2hlsg9jVUSlJfR3CLSxK0x6IjFFWkZShA2niMbRtxx6P1e/oNHGDhnZ/ZvNuTgI47rELtj1GUe6N+/OVAZJu3zQrdJ22gQeOZbU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685705346; h=Content-Type:Content-Transfer-Encoding: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=fqmVSX8hO84E5kmsG+cQHKAtenWwoRq32jK7vbi0oGw=; b=ZGcsQwD/wJnPEC/EROQDDVGl0OjsFdXGvZJc0Gsug6vV2TTp/BUdj8NncXVJ7NRhAxe4JUsgvemNHrwwJWGxsgNI6WALJ8SLSGNqCeYBPVuCSydXbRnpXi4pQXi1M2UV+p5IlPLm6tkDvQ317XtIT85MOwyMyvRZB4yXlY0Yvb4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1685705346441903.8016418141989; Fri, 2 Jun 2023 04:29:06 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-297-NVnAxIgpOwGL-EphkRmySg-1; Fri, 02 Jun 2023 07:28:43 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 39785801224; Fri, 2 Jun 2023 11:28:40 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 26067492B0A; Fri, 2 Jun 2023 11:28:40 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 064D019465A2; Fri, 2 Jun 2023 11:28:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id B42301946595 for ; Fri, 2 Jun 2023 11:28:38 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 875F29E8B; Fri, 2 Jun 2023 11:28:38 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0BD859E68 for ; Fri, 2 Jun 2023 11:28:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685705345; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=fqmVSX8hO84E5kmsG+cQHKAtenWwoRq32jK7vbi0oGw=; b=HjyJskXXz6MNW6q2UTDYbMXtb3499vVDGr/2b7JcItRQVPvJOekcbHMyvt5Aws/VgWboaP eVtTUfTWBFpkXKxnk86VFs2qsvJPBHHCNAf5XHpOpx7kG0lF+yN9EKMDZ+OWDiVupYknYx Vw0xujmjSBxdRcVSKyH3sfgTU4WH3ng= X-MC-Unique: NVnAxIgpOwGL-EphkRmySg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 14/15] conf: nwfilter: Refactor virNWFilterIncludeParse Date: Fri, 2 Jun 2023 13:28:24 +0200 Message-Id: <417918159bef1bd40039ad1e867ad508b1a91e37.1685705273.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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: 1685705348296100009 Content-Type: text/plain; charset="utf-8" Use automatic memory freeing and modern XML parsers to simplify the function. Signed-off-by: Peter Krempa --- src/conf/nwfilter_conf.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index f96ae707f9..b79fd2561e 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -298,7 +298,7 @@ virNWFilterIncludeDefFree(virNWFilterIncludeDef *inc) g_free(inc->filterref); g_free(inc); } - +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virNWFilterIncludeDef, virNWFilterIncludeDef= Free); static void virNWFilterEntryFree(virNWFilterEntry *entry) @@ -2031,27 +2031,15 @@ virNWFilterRuleDetailsParse(xmlNodePtr node, static virNWFilterIncludeDef * virNWFilterIncludeParse(xmlNodePtr cur) { - virNWFilterIncludeDef *ret; - - ret =3D g_new0(virNWFilterIncludeDef, 1); - - ret->filterref =3D virXMLPropString(cur, "filter"); - if (!ret->filterref) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", - _("rule node requires action attribute")); - goto err_exit; - } + g_autoptr(virNWFilterIncludeDef) ret =3D g_new0(virNWFilterIncludeDef,= 1); - ret->params =3D virNWFilterParseParamAttributes(cur); - if (!ret->params) - goto err_exit; + if (!(ret->filterref =3D virXMLPropStringRequired(cur, "filter"))) + return NULL; - return ret; + if (!(ret->params =3D virNWFilterParseParamAttributes(cur))) + return NULL; - err_exit: - virNWFilterIncludeDefFree(ret); - return NULL; + return g_steal_pointer(&ret); } --=20 2.40.1