mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-03-07 17:28:15 +00:00
nwfilter: Replace virNWFilterConfigFile with virFileBuildPath
Remove open coded helper. Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
parent
6b73a13212
commit
324fd3a33c
@ -2775,7 +2775,7 @@ virNWFilterSaveXML(const char *configDir,
|
|||||||
char *configFile = NULL;
|
char *configFile = NULL;
|
||||||
int ret = -1;
|
int ret = -1;
|
||||||
|
|
||||||
if ((configFile = virNWFilterConfigFile(configDir, def->name)) == NULL)
|
if (!(configFile = virFileBuildPath(configDir, def->name, ".xml")))
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
|
|
||||||
if (virFileMakePath(configDir) < 0) {
|
if (virFileMakePath(configDir) < 0) {
|
||||||
@ -3236,17 +3236,6 @@ virNWFilterDefFormat(const virNWFilterDef *def)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
char *
|
|
||||||
virNWFilterConfigFile(const char *dir,
|
|
||||||
const char *name)
|
|
||||||
{
|
|
||||||
char *ret = NULL;
|
|
||||||
|
|
||||||
ignore_value(virAsprintf(&ret, "%s/%s.xml", dir, name));
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
int
|
int
|
||||||
virNWFilterConfLayerInit(virDomainObjListIterator domUpdateCB,
|
virNWFilterConfLayerInit(virDomainObjListIterator domUpdateCB,
|
||||||
void *opaque)
|
void *opaque)
|
||||||
|
@ -593,10 +593,6 @@ int
|
|||||||
virNWFilterSaveConfig(const char *configDir,
|
virNWFilterSaveConfig(const char *configDir,
|
||||||
virNWFilterDefPtr def);
|
virNWFilterDefPtr def);
|
||||||
|
|
||||||
char *
|
|
||||||
virNWFilterConfigFile(const char *dir,
|
|
||||||
const char *name);
|
|
||||||
|
|
||||||
virNWFilterDefPtr
|
virNWFilterDefPtr
|
||||||
virNWFilterDefParseString(const char *xml);
|
virNWFilterDefParseString(const char *xml);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user