[libvirt PATCH v2 19/24] libvirtd: replace straggler VIR_FREE with g_free in all vir*Free() functions

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Signed-off-by: Laine Stump <laine@xxxxxxxxxx>
---
 src/libvirt-domain.c  | 18 +++++++++---------
 src/libvirt-network.c | 14 +++++++-------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
index c9f8ffdb56..dba89a7d3a 100644
--- a/src/libvirt-domain.c
+++ b/src/libvirt-domain.c
@@ -7789,8 +7789,8 @@ virDomainIOThreadInfoFree(virDomainIOThreadInfoPtr info)
     if (!info)
         return;
 
-    VIR_FREE(info->cpumap);
-    VIR_FREE(info);
+    g_free(info->cpumap);
+    g_free(info);
 }
 
 
@@ -12084,10 +12084,10 @@ virDomainStatsRecordListFree(virDomainStatsRecordPtr *stats)
     for (next = stats; *next; next++) {
         virTypedParamsFree((*next)->params, (*next)->nparams);
         virDomainFree((*next)->dom);
-        VIR_FREE(*next);
+        g_free(*next);
     }
 
-    VIR_FREE(stats);
+    g_free(stats);
 }
 
 
@@ -12281,14 +12281,14 @@ virDomainInterfaceFree(virDomainInterfacePtr iface)
     if (!iface)
         return;
 
-    VIR_FREE(iface->name);
-    VIR_FREE(iface->hwaddr);
+    g_free(iface->name);
+    g_free(iface->hwaddr);
 
     for (i = 0; i < iface->naddrs; i++)
-        VIR_FREE(iface->addrs[i].addr);
-    VIR_FREE(iface->addrs);
+        g_free(iface->addrs[i].addr);
+    g_free(iface->addrs);
 
-    VIR_FREE(iface);
+    g_free(iface);
 }
 
 
diff --git a/src/libvirt-network.c b/src/libvirt-network.c
index f691b672c7..92bdbacbff 100644
--- a/src/libvirt-network.c
+++ b/src/libvirt-network.c
@@ -1240,13 +1240,13 @@ virNetworkDHCPLeaseFree(virNetworkDHCPLeasePtr lease)
 {
     if (!lease)
         return;
-    VIR_FREE(lease->iface);
-    VIR_FREE(lease->mac);
-    VIR_FREE(lease->iaid);
-    VIR_FREE(lease->ipaddr);
-    VIR_FREE(lease->hostname);
-    VIR_FREE(lease->clientid);
-    VIR_FREE(lease);
+    g_free(lease->iface);
+    g_free(lease->mac);
+    g_free(lease->iaid);
+    g_free(lease->ipaddr);
+    g_free(lease->hostname);
+    g_free(lease->clientid);
+    g_free(lease);
 }
 
 
-- 
2.29.2




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux