From nobody Tue Feb 10 01:16:15 2026 Delivered-To: importer@patchew.org Received-SPF: permerror (zohomail.com: Error in processing SPF Record) client-ip=216.145.221.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=permerror (zohomail.com: Error in processing SPF Record) 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=1664872450; cv=none; d=zohomail.com; s=zohoarc; b=SXFK3AWMmVPxV4bPBsCV81bx07oaXN8JDd7u2S0l1Ua8Y9cq/9ixX+e31q/0lPMPMpe6q5p8vo40NrPQFMMqYuDqS4Z+d/sj8aFMQEi3H8+5rHQ69aWYcyYGa+byQQPuSUgRjirJkSAxwrCe5MQm9/269k20j1iiEREAMD/+hFU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664872450; 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=c1QJtiuQq12RdHRI02/VOlcEwx2Ebcjni+xOzIeW0+Q=; b=jzJVw3ET+aAUKRmjQnhMVp6+LrwQ2WJthK5cC3T6yMd+a8I5IKm2Q56NKbmdFamMDQE1F2uFxFe5Yv1Fb+2GsbSLJS83y3EYenqy2qbGcL2X829qCOUAMxBVv/+FxZymCK94X+O4X3RBgLmE0noWKyLHH81cHMxh8SfwE/NGq7k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=permerror (zohomail.com: Error in processing SPF Record) 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.145.221.124]) by mx.zohomail.com with SMTPS id 1664872450706425.5552386719139; Tue, 4 Oct 2022 01:34:10 -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-660-31w720PAPvSD-ahWfny1uQ-1; Tue, 04 Oct 2022 04:33:29 -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 A21533C0D187; Tue, 4 Oct 2022 08:33:27 +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 8D916C15BA4; Tue, 4 Oct 2022 08:33:27 +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 7112819465A2; Tue, 4 Oct 2022 08:33:27 +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 DA7F419465A2 for ; Tue, 4 Oct 2022 08:33:25 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id C789640C6EC3; Tue, 4 Oct 2022 08:33:25 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4582040C6EC2 for ; Tue, 4 Oct 2022 08:33:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664872449; 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=c1QJtiuQq12RdHRI02/VOlcEwx2Ebcjni+xOzIeW0+Q=; b=Qt7iNdL49XEorjNooTq7VwnZvQ56qrOvrFgRQPZu72s9LRuYOIjkUTo4UWd6LxCF9KooRK yN3W10eU9fffx+UiQI6dFP3iNSytiX16i3pAed4Lot0B5H55XPUx2yJwW5SDacuy7BzwlF 27ZFNVhmyOZVIaGEdGrJzIBw0NQD9U8= X-MC-Unique: 31w720PAPvSD-ahWfny1uQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 07/43] conf: nwfilterbinding: Provide only virNWFilterBindingDefParse Date: Tue, 4 Oct 2022 10:32:41 +0200 Message-Id: <24c2fac3db2e6ed95e98148e77f71800a44da612.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: 1664872453209100001 Content-Type: text/plain; charset="utf-8" Remove the virNWFilterBindingDefParseString/File thin wrappers. Signed-off-by: Peter Krempa --- src/conf/virnwfilterbindingdef.c | 17 +---------------- src/conf/virnwfilterbindingdef.h | 8 +++----- src/libvirt_private.syms | 3 +-- src/nwfilter/nwfilter_driver.c | 2 +- tests/virnwfilterbindingxml2xmltest.c | 2 +- 5 files changed, 7 insertions(+), 25 deletions(-) diff --git a/src/conf/virnwfilterbindingdef.c b/src/conf/virnwfilterbinding= def.c index 524010c4c4..592731fc1b 100644 --- a/src/conf/virnwfilterbindingdef.c +++ b/src/conf/virnwfilterbindingdef.c @@ -154,7 +154,7 @@ virNWFilterBindingDefParseXML(xmlXPathContextPtr ctxt) } -static virNWFilterBindingDef * +virNWFilterBindingDef * virNWFilterBindingDefParse(const char *xmlStr, const char *filename, unsigned int flags) @@ -171,21 +171,6 @@ virNWFilterBindingDefParse(const char *xmlStr, } -virNWFilterBindingDef * -virNWFilterBindingDefParseString(const char *xmlStr, - unsigned int flags) -{ - return virNWFilterBindingDefParse(xmlStr, NULL, flags); -} - - -virNWFilterBindingDef * -virNWFilterBindingDefParseFile(const char *filename) -{ - return virNWFilterBindingDefParse(NULL, filename, 0); -} - - char * virNWFilterBindingDefFormat(const virNWFilterBindingDef *def) { diff --git a/src/conf/virnwfilterbindingdef.h b/src/conf/virnwfilterbinding= def.h index a5497d5a1c..272ad686a0 100644 --- a/src/conf/virnwfilterbindingdef.h +++ b/src/conf/virnwfilterbindingdef.h @@ -50,11 +50,9 @@ virNWFilterBindingDef * virNWFilterBindingDefParseXML(xmlXPathContextPtr ctxt); virNWFilterBindingDef * -virNWFilterBindingDefParseString(const char *xml, - unsigned int flags); - -virNWFilterBindingDef * -virNWFilterBindingDefParseFile(const char *filename); +virNWFilterBindingDefParse(const char *xmlStr, + const char *filename, + unsigned int flags); char * virNWFilterBindingDefFormat(const virNWFilterBindingDef *def); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 6e85a8c6cb..b8165c07d9 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1364,8 +1364,7 @@ virNWFilterBindingDefCopy; virNWFilterBindingDefFormat; virNWFilterBindingDefFormatBuf; virNWFilterBindingDefFree; -virNWFilterBindingDefParseFile; -virNWFilterBindingDefParseString; +virNWFilterBindingDefParse; virNWFilterBindingDefParseXML; diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 9cb306909c..f9fc09bbd3 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -739,7 +739,7 @@ nwfilterBindingCreateXML(virConnectPtr conn, return NULL; } - def =3D virNWFilterBindingDefParseString(xml, flags); + def =3D virNWFilterBindingDefParse(xml, NULL, flags); if (!def) return NULL; diff --git a/tests/virnwfilterbindingxml2xmltest.c b/tests/virnwfilterbindi= ngxml2xmltest.c index 0c93b58a0c..bde21968fe 100644 --- a/tests/virnwfilterbindingxml2xmltest.c +++ b/tests/virnwfilterbindingxml2xmltest.c @@ -41,7 +41,7 @@ testCompareXMLToXMLFiles(const char *xml) virResetLastError(); - if (!(dev =3D virNWFilterBindingDefParseFile(xml))) + if (!(dev =3D virNWFilterBindingDefParse(NULL, xml, 0))) goto fail; if (!(actual =3D virNWFilterBindingDefFormat(dev))) --=20 2.37.3