NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

nwfilter: Remove need for virNWFilterSaveXML

Browse Source 
Merge code into virNWFilterSaveConfig

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2017-05-30 13:26:58 -04:00
parent 69979369bb
commit f7ecae6107
2 changed files with 7 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/conf/nwfilter_conf.c
View File

@ -2767,13 +2767,16 @@ virNWFilterDefParseFile(const char *filename)
int int
virNWFilterSaveXML(const char *configDir, virNWFilterSaveConfig(const char *configDir,
virNWFilterDefPtr def, virNWFilterDefPtr def)
const char *xml)
{ {
int ret = -1;
char *xml;
char uuidstr[VIR_UUID_STRING_BUFLEN]; char uuidstr[VIR_UUID_STRING_BUFLEN];
char *configFile = NULL; char *configFile = NULL;
int ret = -1;
if (!(xml = virNWFilterDefFormat(def)))
goto cleanup;
if (!(configFile = virFileBuildPath(configDir, def->name, ".xml"))) if (!(configFile = virFileBuildPath(configDir, def->name, ".xml")))
goto cleanup; goto cleanup;
@ -2785,25 +2788,6 @@ virNWFilterSaveXML(const char *configDir,
cleanup: cleanup:
VIR_FREE(configFile); VIR_FREE(configFile);
return ret;
}
int
virNWFilterSaveConfig(const char *configDir,
virNWFilterDefPtr def)
{
int ret = -1;
char *xml;
if (!(xml = virNWFilterDefFormat(def)))
goto cleanup;
if (virNWFilterSaveXML(configDir, def, xml) < 0)
goto cleanup;
ret = 0;
cleanup:
VIR_FREE(xml); VIR_FREE(xml);
return ret; return ret;
} }

5
src/conf/nwfilter_conf.h
View File

@ -580,11 +580,6 @@ virNWFilterDefParseNode(xmlDocPtr xml,
char * char *
virNWFilterDefFormat(const virNWFilterDef *def); virNWFilterDefFormat(const virNWFilterDef *def);
int
virNWFilterSaveXML(const char *configDir,
virNWFilterDefPtr def,
const char *xml);
int int
virNWFilterSaveConfig(const char *configDir, virNWFilterSaveConfig(const char *configDir,
virNWFilterDefPtr def); virNWFilterDefPtr def);