[libvirt] [PATCH 10/15] nwfilter: Replace virNWFilterConfigFile with virFileBuildPath
Remove open coded helper.
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
src/conf/nwfilter_conf.c | 13 +------------
src/conf/nwfilter_conf.h | 4 ----
2 files changed, 1 insertion(+), 16 deletions(-)
diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c
index b69d9db..2352e60 100644
--- a/src/conf/nwfilter_conf.c
+++ b/src/conf/nwfilter_conf.c
@@ -2775,7 +2775,7 @@ virNWFilterSaveXML(const char *configDir,
char *configFile = NULL;
int ret = -1;
- if ((configFile = virNWFilterConfigFile(configDir, def->name)) == NULL)
+ if (!(configFile = virFileBuildPath(configDir, def->name, ".xml")))
goto cleanup;
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
virNWFilterConfLayerInit(virDomainObjListIterator domUpdateCB,
void *opaque)
diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h
index d8a5daf..5bf9c3d 100644
--- a/src/conf/nwfilter_conf.h
+++ b/src/conf/nwfilter_conf.h
@@ -593,10 +593,6 @@ int
virNWFilterSaveConfig(const char *configDir,
virNWFilterDefPtr def);
-char *
-virNWFilterConfigFile(const char *dir,
- const char *name);
-
virNWFilterDefPtr
virNWFilterDefParseString(const char *xml);
--
2.9.3