nwfilter: Replace virNWFilterConfigFile with virFileBuildPath

Remove open coded helper.

Signed-off-by: John Ferlan <jferlan@redhat.com>

diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c
index b69d9dbd8bc45f4789be84b28284318df81967c6..2352e606b44f1e2d705a359e8d6a2da570bdc327 100644 (file)
--- 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 d8a5daf219d4d553e4bf392238d558cc63222487..5bf9c3daaeefc224efe4c1428d21d3c8d749e5fa 100644 (file)
--- 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);