conf: nwfilter: Provide only virNWFilterDefParse

Replace virNWFilterDefParseString/File with the common function.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c
index 00728782d134f8c8812c162655c3fe4611681dc9..9a95ae6c12d6bb5d3a1988bb16f7fe85c867ae81 100644 (file)
--- a/src/conf/nwfilter_conf.c
+++ b/src/conf/nwfilter_conf.c
@@ -2685,7 +2685,7 @@ virNWFilterDefParseXML(xmlXPathContextPtr ctxt)
 }
 
 
-static virNWFilterDef *
+virNWFilterDef *
 virNWFilterDefParse(const char *xmlStr,
                     const char *filename,
                     unsigned int flags)
@@ -2702,21 +2702,6 @@ virNWFilterDefParse(const char *xmlStr,
 }
 
 
-virNWFilterDef *
-virNWFilterDefParseString(const char *xmlStr,
-                          unsigned int flags)
-{
-    return virNWFilterDefParse(xmlStr, NULL, flags);
-}
-
-
-virNWFilterDef *
-virNWFilterDefParseFile(const char *filename)
-{
-    return virNWFilterDefParse(NULL, filename, 0);
-}
-
-
 int
 virNWFilterSaveConfig(const char *configDir,
                       virNWFilterDef *def)

diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h
index b8a970f00b8de84527c63f4eea6e82e59c94bcb1..1a38e4198cd61c3861bfd2936b35f2064097b4d3 100644 (file)
--- a/src/conf/nwfilter_conf.h
+++ b/src/conf/nwfilter_conf.h
@@ -541,11 +541,9 @@ virNWFilterSaveConfig(const char *configDir,
                       virNWFilterDef *def);
 
 virNWFilterDef *
-virNWFilterDefParseString(const char *xml,
-                          unsigned int flags);
-
-virNWFilterDef *
-virNWFilterDefParseFile(const char *filename);
+virNWFilterDefParse(const char *xmlStr,
+                    const char *filename,
+                    unsigned int flags);
 
 typedef int (*virNWFilterTriggerRebuildCallback)(void *opaque);
 

diff --git a/src/conf/virnwfilterobj.c b/src/conf/virnwfilterobj.c
index f9c1b049d562f902706b6685e6c94ef306191098..e8dfe66b3cb796d126ef91ba374d1b6483b03085 100644 (file)
--- a/src/conf/virnwfilterobj.c
+++ b/src/conf/virnwfilterobj.c
@@ -578,7 +578,7 @@ virNWFilterObjListLoadConfig(virNWFilterObjList *nwfilters,
     if (!(configFile = virFileBuildPath(configDir, name, ".xml")))
         goto error;
 
-    if (!(def = virNWFilterDefParseFile(configFile)))
+    if (!(def = virNWFilterDefParse(NULL, configFile, 0)))
         goto error;
 
     if (STRNEQ(name, def->name)) {

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 0adcf20f0cafdd7c305e88ce2264eb2dcc748966..6836c99fff658e92cdacf7ef4b341ca41609a1f4 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -952,8 +952,7 @@ virNWFilterConfLayerInit;
 virNWFilterConfLayerShutdown;
 virNWFilterDefFormat;
 virNWFilterDefFree;
-virNWFilterDefParseFile;
-virNWFilterDefParseString;
+virNWFilterDefParse;
 virNWFilterDeleteDef;
 virNWFilterJumpTargetTypeToString;
 virNWFilterPrintStateMatchFlags;

diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c
index f9fc09bbd3d48c96a0fecdbfe245b513e1828fba..8e45096eaa847b2b91336814a212490ee04c15cc 100644 (file)
--- a/src/nwfilter/nwfilter_driver.c
+++ b/src/nwfilter/nwfilter_driver.c
@@ -545,7 +545,7 @@ nwfilterDefineXMLFlags(virConnectPtr conn,
         return NULL;
     }
 
-    if (!(def = virNWFilterDefParseString(xml, flags)))
+    if (!(def = virNWFilterDefParse(xml, NULL, flags)))
         goto cleanup;
 
     if (virNWFilterDefineXMLFlagsEnsureACL(conn, def) < 0)

diff --git a/tests/nwfilterxml2firewalltest.c b/tests/nwfilterxml2firewalltest.c
index 1514002b8fc2083f6ad37d5f8552b8550f2fa9b0..bd112cef838df9edcb34b3c87e225ae5290b6f06 100644 (file)
--- a/tests/nwfilterxml2firewalltest.c
+++ b/tests/nwfilterxml2firewalltest.c
@@ -255,7 +255,7 @@ virNWFilterDefToInst(const char *xml,
 {
     size_t i;
     int ret = -1;
-    virNWFilterDef *def = virNWFilterDefParseFile(xml);
+    virNWFilterDef *def = virNWFilterDefParse(NULL, xml, 0);
 
     if (!def)
         return -1;

diff --git a/tests/nwfilterxml2xmltest.c b/tests/nwfilterxml2xmltest.c
index c2b6dc575bbcc7ffe1d19556d91d7ea18b9cb8d3..ca037ad9a0c9b41817a006ef991bdc7b1285d4ab 100644 (file)
--- a/tests/nwfilterxml2xmltest.c
+++ b/tests/nwfilterxml2xmltest.c
@@ -21,7 +21,7 @@ testCompareXMLToXMLFiles(const char *inxml, const char *outxml,
 
     virResetLastError();
 
-    if (!(dev = virNWFilterDefParseFile(inxml))) {
+    if (!(dev = virNWFilterDefParse(NULL, inxml, 0))) {
         if (expect_error) {
             virResetLastError();
             goto done;