[libvirt PATCH 15/15] datatypes: replace VIR_FREE with g_free in all *Dispose() functions

[Laine Stump]

Signed-off-by: Laine Stump <la...@redhat.com>
---
 src/datatypes.c | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/datatypes.c b/src/datatypes.c
index 1db38c5aa6..e36f3a2d24 100644
--- a/src/datatypes.c
+++ b/src/datatypes.c
@@ -347,7 +347,7 @@ virDomainDispose(void *obj)
     virUUIDFormat(domain->uuid, uuidstr);
     VIR_DEBUG("release domain %p %s %s", domain, domain->name, uuidstr);
 
-    VIR_FREE(domain->name);
+    g_free(domain->name);
     virObjectUnref(domain->conn);
 }
 
@@ -409,7 +409,7 @@ virNetworkDispose(void *obj)
     virUUIDFormat(network->uuid, uuidstr);
     VIR_DEBUG("release network %p %s %s", network, network->name, uuidstr);
 
-    VIR_FREE(network->name);
+    g_free(network->name);
     virObjectUnref(network->conn);
 }
 
@@ -528,8 +528,8 @@ virInterfaceDispose(void *obj)
     virInterfacePtr iface = obj;
     VIR_DEBUG("release interface %p %s", iface, iface->name);
 
-    VIR_FREE(iface->name);
-    VIR_FREE(iface->mac);
+    g_free(iface->name);
+    g_free(iface->mac);
     virObjectUnref(iface->conn);
 }
 
@@ -603,7 +603,7 @@ virStoragePoolDispose(void *obj)
     if (pool->privateDataFreeFunc)
         pool->privateDataFreeFunc(pool->privateData);
 
-    VIR_FREE(pool->name);
+    g_free(pool->name);
     virObjectUnref(pool->conn);
 }
 
@@ -676,9 +676,9 @@ virStorageVolDispose(void *obj)
     if (vol->privateDataFreeFunc)
         vol->privateDataFreeFunc(vol->privateData);
 
-    VIR_FREE(vol->key);
-    VIR_FREE(vol->name);
-    VIR_FREE(vol->pool);
+    g_free(vol->key);
+    g_free(vol->name);
+    g_free(vol->pool);
     virObjectUnref(vol->conn);
 }
 
@@ -734,8 +734,8 @@ virNodeDeviceDispose(void *obj)
     virNodeDevicePtr dev = obj;
     VIR_DEBUG("release dev %p %s", dev, dev->name);
 
-    VIR_FREE(dev->name);
-    VIR_FREE(dev->parentName);
+    g_free(dev->name);
+    g_free(dev->parentName);
 
     virObjectUnref(dev->conn);
 }
@@ -798,7 +798,7 @@ virSecretDispose(void *obj)
     virUUIDFormat(secret->uuid, uuidstr);
     VIR_DEBUG("release secret %p %s", secret, uuidstr);
 
-    VIR_FREE(secret->usageID);
+    g_free(secret->usageID);
     virObjectUnref(secret->conn);
 }
 
@@ -910,7 +910,7 @@ virNWFilterDispose(void *obj)
     virUUIDFormat(nwfilter->uuid, uuidstr);
     VIR_DEBUG("release nwfilter %p %s %s", nwfilter, nwfilter->name, uuidstr);
 
-    VIR_FREE(nwfilter->name);
+    g_free(nwfilter->name);
     virObjectUnref(nwfilter->conn);
 }
 
@@ -972,8 +972,8 @@ virNWFilterBindingDispose(void *obj)
 
     VIR_DEBUG("release binding %p %s", binding, binding->portdev);
 
-    VIR_FREE(binding->portdev);
-    VIR_FREE(binding->filtername);
+    g_free(binding->portdev);
+    g_free(binding->filtername);
     virObjectUnref(binding->conn);
 }
 
@@ -1030,7 +1030,7 @@ virDomainCheckpointDispose(void *obj)
     virDomainCheckpointPtr checkpoint = obj;
     VIR_DEBUG("release checkpoint %p %s", checkpoint, checkpoint->name);
 
-    VIR_FREE(checkpoint->name);
+    g_free(checkpoint->name);
     virObjectUnref(checkpoint->domain);
 }
 
@@ -1086,7 +1086,7 @@ virDomainSnapshotDispose(void *obj)
     virDomainSnapshotPtr snapshot = obj;
     VIR_DEBUG("release snapshot %p %s", snapshot, snapshot->name);
 
-    VIR_FREE(snapshot->name);
+    g_free(snapshot->name);
     virObjectUnref(snapshot->domain);
 }
 
@@ -1222,7 +1222,7 @@ virAdmServerDispose(void *obj)
     virAdmServerPtr srv = obj;
     VIR_DEBUG("release server srv=%p name=%s", srv, srv->name);
 
-    VIR_FREE(srv->name);
+    g_free(srv->name);
     virObjectUnref(srv->conn);
 }
 
-- 
2.29.2