Make hash destructors call internal unref methods to free objects

diff --git a/ChangeLog b/ChangeLog
index 249b2f2d75ba0ad4cd0deae2d1513020bfb658a2..ecc35a29fe0bf61d37a04c3cfc6f17d12f6638ec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon May 11 16:25:22 BST 2009 Daniel P. Berrange <berrange@redhat.com>
+
+       * src/datatypes.c: Change hash destructors to call the internal
+       virUnrefXXX methods instead of public virXXXFree methods (Laine
+       Stump)
+
 Mon May 11 16:25:22 BST 2009 Daniel P. Berrange <berrange@redhat.com>
 
        * src/lxc_container.c: Fix unused variable warning

diff --git a/src/datatypes.c b/src/datatypes.c
index b1013f201a69fdd2be33dca1c96e6a8f9a6f7aa5..eceb839b3fc8a161be821422788073c62d36ea93 100644 (file)
--- a/src/datatypes.c
+++ b/src/datatypes.c
@@ -49,7 +49,7 @@
 static int
 virDomainFreeName(virDomainPtr domain, const char *name ATTRIBUTE_UNUSED)
 {
-    return (virDomainFree(domain));
+    return (virUnrefDomain(domain));
 }
 
 /**
@@ -63,7 +63,7 @@ virDomainFreeName(virDomainPtr domain, const char *name ATTRIBUTE_UNUSED)
 static int
 virNetworkFreeName(virNetworkPtr network, const char *name ATTRIBUTE_UNUSED)
 {
-    return (virNetworkFree(network));
+    return (virUnrefNetwork(network));
 }
 
 /**
@@ -77,7 +77,7 @@ virNetworkFreeName(virNetworkPtr network, const char *name ATTRIBUTE_UNUSED)
 static int
 virStoragePoolFreeName(virStoragePoolPtr pool, const char *name ATTRIBUTE_UNUSED)
 {
-    return (virStoragePoolFree(pool));
+    return (virUnrefStoragePool(pool));
 }
 
 /**
@@ -91,7 +91,7 @@ virStoragePoolFreeName(virStoragePoolPtr pool, const char *name ATTRIBUTE_UNUSED
 static int
 virStorageVolFreeName(virStorageVolPtr vol, const char *name ATTRIBUTE_UNUSED)
 {
-    return (virStorageVolFree(vol));
+    return (virUnrefStorageVol(vol));
 }
 
 /**