From nobody Mon Feb 9 09:28:50 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=1664872417; cv=none; d=zohomail.com; s=zohoarc; b=V6CB3Y/XWBTR2iKxzomuYt2fKMCAJmJu9oVzjS0j+hTSKT38+l5OXozKowleko8kqZqfnTmQa4Y8tU989ZKiqR8xKCRkpjdw0OdCuICG42yoDAgSV+HEACm1B/Dc+DSgOxeTwo0q+prsF9F2vYbRpfgK3/lYN9J7Nfsj+U+7PxI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664872417; 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=zlzeo5kKsxOugpGku4+H2VrkQiTj/4Q4m9aru4a2EaU=; b=ao/pQ3ev1ZJMHUw6qkwBAd3kD/m9oHosm6ilRbTZucCxT3tTZyRiMtlXaKRQumjv8pDwCYdrUO3xhOo1FJ8OAl/2hlKjycit6jE+V/utCeHf72FLTn9429RPF+LDHBKDH1B6YYzQeeyHAo/2d0j+y6T9vhAj6VBlpNgD5emYh/Q= 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 1664872417222310.8933730847606; Tue, 4 Oct 2022 01:33:37 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-444-FX0AKIVyPBelkJAXa54xkA-1; Tue, 04 Oct 2022 04:33:25 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3C5573803931; Tue, 4 Oct 2022 08:33:23 +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 1F85BC15BBD; Tue, 4 Oct 2022 08:33:23 +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 9160C1946A71; Tue, 4 Oct 2022 08:33:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 3F5B01947048 for ; Tue, 4 Oct 2022 08:33:22 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 30F0440C6EC3; Tue, 4 Oct 2022 08:33:22 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id A1B2D40C6EC2 for ; Tue, 4 Oct 2022 08:33:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664872416; 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=zlzeo5kKsxOugpGku4+H2VrkQiTj/4Q4m9aru4a2EaU=; b=WRlB9HT/bL9BJ/0eX/Rv6+Gg633x6qtOcLFOkmDeehdGVX3lkjMTWYU1+cM/ssipBO7vh8 O1w717b5zlgnFr6NaRuoci5PwY3VU4T8msfP5i3j+CTu3SX7y1T62bVfsdn2A7hIc+esGP GIXK3OqrV/lUEpcrkwLZ8T2Fj7lb8No= X-MC-Unique: FX0AKIVyPBelkJAXa54xkA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 03/43] virNWFilterBindingObjParse: Refactor XML parsing code Date: Tue, 4 Oct 2022 10:32:37 +0200 Message-Id: <86b6083bfec5a1384cc25fa1f84114e2f21a3800.1664870258.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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.8 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: 1664872419172100001 Content-Type: text/plain; charset="utf-8" Remove the redundant root node checking and XPath context creation by using virXMLParse properly. Signed-off-by: Peter Krempa --- src/conf/virnwfilterbindingobj.c | 65 +++++----------------------- src/conf/virnwfilterbindingobj.h | 2 +- src/conf/virnwfilterbindingobjlist.c | 2 +- src/libvirt_private.syms | 2 +- 4 files changed, 14 insertions(+), 57 deletions(-) diff --git a/src/conf/virnwfilterbindingobj.c b/src/conf/virnwfilterbinding= obj.c index cc6009d1f2..5ff53f7380 100644 --- a/src/conf/virnwfilterbindingobj.c +++ b/src/conf/virnwfilterbindingobj.c @@ -202,74 +202,31 @@ virNWFilterBindingObjDelete(const virNWFilterBindingO= bj *obj, } -static virNWFilterBindingObj * -virNWFilterBindingObjParseXML(xmlDocPtr doc, - xmlXPathContextPtr ctxt) +virNWFilterBindingObj * +virNWFilterBindingObjParse(const char *filename) { - virNWFilterBindingObj *ret; + g_autoptr(virNWFilterBindingObj) ret =3D NULL; + g_autoptr(xmlDoc) xml =3D NULL; + g_autoptr(xmlXPathContext) ctxt =3D NULL; xmlNodePtr node; + if (!(xml =3D virXMLParse(filename, NULL, _("(nwfilterbinding_status)"= ), + "filterbindingstatus", &ctxt, NULL, false))) + return NULL; + if (!(ret =3D virNWFilterBindingObjNew())) return NULL; if (!(node =3D virXPathNode("./filterbinding", ctxt))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("filter binding status missing content")); - goto cleanup; - } - - if (!(ret->def =3D virNWFilterBindingDefParseNode(doc, node))) - goto cleanup; - - return ret; - - cleanup: - virObjectUnref(ret); - return NULL; -} - - -static virNWFilterBindingObj * -virNWFilterBindingObjParseNode(xmlDocPtr doc, - xmlNodePtr root) -{ - g_autoptr(xmlXPathContext) ctxt =3D NULL; - - if (STRNEQ((const char *)root->name, "filterbindingstatus")) { - virReportError(VIR_ERR_XML_ERROR, - _("unknown root element '%s' for filter binding"), - root->name); return NULL; } - if (!(ctxt =3D virXMLXPathContextNew(doc))) + if (!(ret->def =3D virNWFilterBindingDefParseNode(xml, node))) return NULL; - ctxt->node =3D root; - return virNWFilterBindingObjParseXML(doc, ctxt); -} - - -static virNWFilterBindingObj * -virNWFilterBindingObjParse(const char *xmlStr, - const char *filename) -{ - virNWFilterBindingObj *obj =3D NULL; - g_autoptr(xmlDoc) xml =3D NULL; - - if ((xml =3D virXMLParse(filename, xmlStr, _("(nwfilterbinding_status)= "), - NULL, NULL, NULL, false))) { - obj =3D virNWFilterBindingObjParseNode(xml, xmlDocGetRootElement(x= ml)); - } - - return obj; -} - - -virNWFilterBindingObj * -virNWFilterBindingObjParseFile(const char *filename) -{ - return virNWFilterBindingObjParse(NULL, filename); + return g_steal_pointer(&ret); } diff --git a/src/conf/virnwfilterbindingobj.h b/src/conf/virnwfilterbinding= obj.h index 17f855bda1..33aa575436 100644 --- a/src/conf/virnwfilterbindingobj.h +++ b/src/conf/virnwfilterbindingobj.h @@ -64,7 +64,7 @@ virNWFilterBindingObjDelete(const virNWFilterBindingObj *= obj, const char *statusDir); virNWFilterBindingObj * -virNWFilterBindingObjParseFile(const char *filename); +virNWFilterBindingObjParse(const char *filename); char * virNWFilterBindingObjFormat(const virNWFilterBindingObj *obj); diff --git a/src/conf/virnwfilterbindingobjlist.c b/src/conf/virnwfilterbin= dingobjlist.c index 9a46fa06b9..a349f5c195 100644 --- a/src/conf/virnwfilterbindingobjlist.c +++ b/src/conf/virnwfilterbindingobjlist.c @@ -266,7 +266,7 @@ virNWFilterBindingObjListLoadStatus(virNWFilterBindingO= bjList *bindings, if ((statusFile =3D virNWFilterBindingObjConfigFile(statusDir, name)) = =3D=3D NULL) goto error; - if (!(obj =3D virNWFilterBindingObjParseFile(statusFile))) + if (!(obj =3D virNWFilterBindingObjParse(statusFile))) goto error; def =3D virNWFilterBindingObjGetDef(obj); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 5be40dbefe..11862bb1a9 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1377,7 +1377,7 @@ virNWFilterBindingObjFormat; virNWFilterBindingObjGetDef; virNWFilterBindingObjGetRemoving; virNWFilterBindingObjNew; -virNWFilterBindingObjParseFile; +virNWFilterBindingObjParse; virNWFilterBindingObjSave; virNWFilterBindingObjSetDef; virNWFilterBindingObjSetRemoving; --=20 2.37.3