virStorageNetHostDefClear: Move into virStorageNetHostDefFree

There are no other callers.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/conf/storage_source_conf.c b/src/conf/storage_source_conf.c
index db12dfd961d9620c4decad906eb4d4dce0ac9659..9f285804068243e758399ae26d006453a915cf27 100644 (file)
--- a/src/conf/storage_source_conf.c
+++ b/src/conf/storage_source_conf.c
@@ -142,18 +142,6 @@ virStorageSourceHasBacking(const virStorageSource *src)
 }
 
 
-void
-virStorageNetHostDefClear(virStorageNetHostDef *def)
-{
-    if (!def)
-        return;
-
-    VIR_FREE(def->name);
-    VIR_FREE(def->socket);
-    VIR_FREE(def->fdgroup);
-}
-
-
 void
 virStorageNetHostDefFree(size_t nhosts,
                          virStorageNetHostDef *hosts)
@@ -163,8 +151,11 @@ virStorageNetHostDefFree(size_t nhosts,
     if (!hosts)
         return;
 
-    for (i = 0; i < nhosts; i++)
-        virStorageNetHostDefClear(&hosts[i]);
+    for (i = 0; i < nhosts; i++) {
+        g_free(hosts[i].name);
+        g_free(hosts[i].socket);
+        g_free(hosts[i].fdgroup);
+    }
 
     g_free(hosts);
 }

diff --git a/src/conf/storage_source_conf.h b/src/conf/storage_source_conf.h
index 52ed30365785adbede27addf6bd3a8d9037c9dcb..de7895e637a2b81c4e780895d0bae4cfef3772f7 100644 (file)
--- a/src/conf/storage_source_conf.h
+++ b/src/conf/storage_source_conf.h
@@ -505,9 +505,6 @@ virSecurityDeviceLabelDef *
 virStorageSourceGetSecurityLabelDef(virStorageSource *src,
                                     const char *model);
 
-void
-virStorageNetHostDefClear(virStorageNetHostDef *def);
-
 void
 virStorageNetHostDefFree(size_t nhosts,
                          virStorageNetHostDef *hosts);

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 812fa4e43519f71b8a8cd75ff41723ee0b5da82d..a8ebf9efd8cd300420233f0846457ac9730e8d80 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1153,7 +1153,6 @@ virStorageFileFeatureTypeFromString;
 virStorageFileFeatureTypeToString;
 virStorageFileFormatTypeFromString;
 virStorageFileFormatTypeToString;
-virStorageNetHostDefClear;
 virStorageNetHostDefCopy;
 virStorageNetHostDefFree;
 virStorageNetHostTransportTypeFromString;