External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-07 18:35:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: nwfilter: Provide only virNWFilterDefParse

Browse Source 
Replace virNWFilterDefParseString/File with the common function.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2022-09-23 10:36:36 +02:00
parent 2a8998d427
commit 5ea1d04322
7 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/conf/nwfilter_conf.c
View File

@ -2685,7 +2685,7 @@ virNWFilterDefParseXML(xmlXPathContextPtr ctxt)
} }
static virNWFilterDef * virNWFilterDef *
virNWFilterDefParse(const char *xmlStr, virNWFilterDefParse(const char *xmlStr,
const char *filename, const char *filename,
unsigned int flags) 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 int
virNWFilterSaveConfig(const char *configDir, virNWFilterSaveConfig(const char *configDir,
virNWFilterDef *def) virNWFilterDef *def)

8
src/conf/nwfilter_conf.h
View File

@ -541,11 +541,9 @@ virNWFilterSaveConfig(const char *configDir,
virNWFilterDef *def); virNWFilterDef *def);
virNWFilterDef * virNWFilterDef *
virNWFilterDefParseString(const char *xml, virNWFilterDefParse(const char *xmlStr,
unsigned int flags); const char *filename,
unsigned int flags);
virNWFilterDef *
virNWFilterDefParseFile(const char *filename);
typedef int (*virNWFilterTriggerRebuildCallback)(void *opaque); typedef int (*virNWFilterTriggerRebuildCallback)(void *opaque);

2
src/conf/virnwfilterobj.c
View File

@ -578,7 +578,7 @@ virNWFilterObjListLoadConfig(virNWFilterObjList *nwfilters,
if (!(configFile = virFileBuildPath(configDir, name, ".xml"))) if (!(configFile = virFileBuildPath(configDir, name, ".xml")))
goto error; goto error;
if (!(def = virNWFilterDefParseFile(configFile))) if (!(def = virNWFilterDefParse(NULL, configFile, 0)))
goto error; goto error;
if (STRNEQ(name, def->name)) { if (STRNEQ(name, def->name)) {

3
src/libvirt_private.syms
View File

@ -952,8 +952,7 @@ virNWFilterConfLayerInit;
virNWFilterConfLayerShutdown; virNWFilterConfLayerShutdown;
virNWFilterDefFormat; virNWFilterDefFormat;
virNWFilterDefFree; virNWFilterDefFree;
virNWFilterDefParseFile; virNWFilterDefParse;
virNWFilterDefParseString;
virNWFilterDeleteDef; virNWFilterDeleteDef;
virNWFilterJumpTargetTypeToString; virNWFilterJumpTargetTypeToString;
virNWFilterPrintStateMatchFlags; virNWFilterPrintStateMatchFlags;

2
src/nwfilter/nwfilter_driver.c
View File

@ -545,7 +545,7 @@ nwfilterDefineXMLFlags(virConnectPtr conn,
return NULL; return NULL;
} }
if (!(def = virNWFilterDefParseString(xml, flags))) if (!(def = virNWFilterDefParse(xml, NULL, flags)))
goto cleanup; goto cleanup;
if (virNWFilterDefineXMLFlagsEnsureACL(conn, def) < 0) if (virNWFilterDefineXMLFlagsEnsureACL(conn, def) < 0)

2
tests/nwfilterxml2firewalltest.c
View File

@ -255,7 +255,7 @@ virNWFilterDefToInst(const char *xml,
{ {
size_t i; size_t i;
int ret = -1; int ret = -1;
virNWFilterDef *def = virNWFilterDefParseFile(xml); virNWFilterDef *def = virNWFilterDefParse(NULL, xml, 0);
if (!def) if (!def)
return -1; return -1;

2
tests/nwfilterxml2xmltest.c
View File

@ -21,7 +21,7 @@ testCompareXMLToXMLFiles(const char *inxml, const char *outxml,
virResetLastError(); virResetLastError();
if (!(dev = virNWFilterDefParseFile(inxml))) { if (!(dev = virNWFilterDefParse(NULL, inxml, 0))) {
if (expect_error) { if (expect_error) {
virResetLastError(); virResetLastError();
goto done; goto done;