tools: replace VIR_FREE with g_free in all vir*Free() functions

Signed-off-by: Laine Stump <laine@redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>

diff --git a/tools/virsh-checkpoint.c b/tools/virsh-checkpoint.c
index f6396d16eb32d562b67b0909df1082c7cacd9120..6e68ba66fff172c0a927b1e345dbebe47a3c9a1d 100644 (file)
--- a/tools/virsh-checkpoint.c
+++ b/tools/virsh-checkpoint.c
@@ -552,11 +552,11 @@ virshCheckpointListFree(virshCheckpointListPtr checkpointlist)
     if (checkpointlist->chks) {
         for (i = 0; i < checkpointlist->nchks; i++) {
             virshDomainCheckpointFree(checkpointlist->chks[i].chk);
-            VIR_FREE(checkpointlist->chks[i].parent);
+            g_free(checkpointlist->chks[i].parent);
         }
-        VIR_FREE(checkpointlist->chks);
+        g_free(checkpointlist->chks);
     }
-    VIR_FREE(checkpointlist);
+    g_free(checkpointlist);
 }
 
 

diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c
index 5d0a03afa914fe07059b1c5fdb1f0dbfc66255fd..02ff1fbd62d498d13189fc54d598120022a4d4b2 100644 (file)
--- a/tools/virsh-domain-monitor.c
+++ b/tools/virsh-domain-monitor.c
@@ -1609,9 +1609,9 @@ virshDomainListFree(virshDomainListPtr domlist)
     if (domlist && domlist->domains) {
         for (i = 0; i < domlist->ndomains; i++)
             virshDomainFree(domlist->domains[i]);
-        VIR_FREE(domlist->domains);
+        g_free(domlist->domains);
     }
-    VIR_FREE(domlist);
+    g_free(domlist);
 }
 
 static virshDomainListPtr

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index fb8b4bdb7229c362021bf379a4a51d5bfa543540..98a87dd43cbcd814cbe11093c1336e6d27720141 100644 (file)
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -1796,7 +1796,7 @@ virshBlockJobWaitFree(virshBlockJobWaitDataPtr data)
     if (data->cb_id2 >= 0)
         virConnectDomainEventDeregisterAny(priv->conn, data->cb_id2);
 
-    VIR_FREE(data);
+    g_free(data);
 }
 
 

diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c
index 858052d3419c3b04cb89cd1c5ee7c2f1f6b66040..a11d4ba60759423312cbd54a81cc2b96c4b4920e 100644 (file)
--- a/tools/virsh-interface.c
+++ b/tools/virsh-interface.c
@@ -176,9 +176,9 @@ virshInterfaceListFree(virshInterfaceListPtr list)
             if (list->ifaces[i])
                 virInterfaceFree(list->ifaces[i]);
         }
-        VIR_FREE(list->ifaces);
+        g_free(list->ifaces);
     }
-    VIR_FREE(list);
+    g_free(list);
 }
 
 static virshInterfaceListPtr

diff --git a/tools/virsh-network.c b/tools/virsh-network.c
index 9e3b31a60c22047286fbf66c3b16f17df649f761..a203fa64ff9d23c52503a9732f4c945ef2fb2a2b 100644 (file)
--- a/tools/virsh-network.c
+++ b/tools/virsh-network.c
@@ -459,9 +459,9 @@ virshNetworkListFree(virshNetworkListPtr list)
             if (list->nets[i])
                 virNetworkFree(list->nets[i]);
         }
-        VIR_FREE(list->nets);
+        g_free(list->nets);
     }
-    VIR_FREE(list);
+    g_free(list);
 }
 
 static virshNetworkListPtr
@@ -1676,9 +1676,9 @@ virshNetworkPortListFree(virshNetworkPortListPtr list)
             if (list->ports[i])
                 virNetworkPortFree(list->ports[i]);
         }
-        VIR_FREE(list->ports);
+        g_free(list->ports);
     }
-    VIR_FREE(list);
+    g_free(list);
 }
 
 static virshNetworkPortListPtr

diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c
index 69422e20f5709f29389d08cc919bcf1a3671cb1b..fedc8497f8650c0b2803b34b91dac9bdff20b99d 100644 (file)
--- a/tools/virsh-nodedev.c
+++ b/tools/virsh-nodedev.c
@@ -205,9 +205,9 @@ virshNodeDeviceListFree(virshNodeDeviceListPtr list)
             if (list->devices[i])
                 virNodeDeviceFree(list->devices[i]);
         }
-        VIR_FREE(list->devices);
+        g_free(list->devices);
     }
-    VIR_FREE(list);
+    g_free(list);
 }
 
 static virshNodeDeviceListPtr

diff --git a/tools/virsh-nwfilter.c b/tools/virsh-nwfilter.c
index 768a96e949a750c3d40ee8914c03e59fea3c32f0..0d09a016bceb1a8e2431e99506eef04edd1dc517 100644 (file)
--- a/tools/virsh-nwfilter.c
+++ b/tools/virsh-nwfilter.c
@@ -234,9 +234,9 @@ virshNWFilterListFree(virshNWFilterListPtr list)
             if (list->filters[i])
                 virNWFilterFree(list->filters[i]);
         }
-        VIR_FREE(list->filters);
+        g_free(list->filters);
     }
-    VIR_FREE(list);
+    g_free(list);
 }
 
 static virshNWFilterListPtr
@@ -654,9 +654,9 @@ virshNWFilterBindingListFree(virshNWFilterBindingListPtr list)
             if (list->bindings[i])
                 virNWFilterBindingFree(list->bindings[i]);
         }
-        VIR_FREE(list->bindings);
+        g_free(list->bindings);
     }
-    VIR_FREE(list);
+    g_free(list);
 }
 
 

diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c
index 7835fa6d757e484ee7468d09ce28465d415d33d4..5256b5058956f44ecb77f297555b605827832ce3 100644 (file)
--- a/tools/virsh-pool.c
+++ b/tools/virsh-pool.c
@@ -850,9 +850,9 @@ virshStoragePoolListFree(virshStoragePoolListPtr list)
             if (list->pools[i])
                 virStoragePoolFree(list->pools[i]);
         }
-        VIR_FREE(list->pools);
+        g_free(list->pools);
     }
-    VIR_FREE(list);
+    g_free(list);
 }
 
 static virshStoragePoolListPtr

diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c
index fcfbe5fe9e163dca9654c766552d37c19b4ee760..7ca3e864dad3d5da61d7603d7e4493bfc00590be 100644 (file)
--- a/tools/virsh-secret.c
+++ b/tools/virsh-secret.c
@@ -410,9 +410,9 @@ virshSecretListFree(virshSecretListPtr list)
         for (i = 0; i < list->nsecrets; i++)
             virshSecretFree(list->secrets[i]);
 
-        VIR_FREE(list->secrets);
+        g_free(list->secrets);
     }
-    VIR_FREE(list);
+    g_free(list);
 }
 
 static virshSecretListPtr

diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c
index 478657b5b6a60b564a1a6c25fee754b681c3a18b..1b10ef37e3df77c621a884d2521ec63d0538bee4 100644 (file)
--- a/tools/virsh-snapshot.c
+++ b/tools/virsh-snapshot.c
@@ -1032,11 +1032,11 @@ virshSnapshotListFree(virshSnapshotListPtr snaplist)
     if (snaplist->snaps) {
         for (i = 0; i < snaplist->nsnaps; i++) {
             virshDomainSnapshotFree(snaplist->snaps[i].snap);
-            VIR_FREE(snaplist->snaps[i].parent);
+            g_free(snaplist->snaps[i].parent);
         }
-        VIR_FREE(snaplist->snaps);
+        g_free(snaplist->snaps);
     }
-    VIR_FREE(snaplist);
+    g_free(snaplist);
 }
 
 static int

diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c
index c86abb863f99303220d4876c44031f2919472912..af2d1d42a30ae362def303201f76c26e2d599b3f 100644 (file)
--- a/tools/virsh-volume.c
+++ b/tools/virsh-volume.c
@@ -1273,9 +1273,9 @@ virshStorageVolListFree(virshStorageVolListPtr list)
             if (list->vols[i])
                 virStorageVolFree(list->vols[i]);
         }
-        VIR_FREE(list->vols);
+        g_free(list->vols);
     }
-    VIR_FREE(list);
+    g_free(list);
 }
 
 static virshStorageVolListPtr

diff --git a/tools/vsh-table.c b/tools/vsh-table.c
index 44713686872d946b6f0a200861dc65511a42241b..d09cc9e14e3e8022170538bd00ecc733f5f41e55 100644 (file)
--- a/tools/vsh-table.c
+++ b/tools/vsh-table.c
@@ -52,10 +52,10 @@ vshTableRowFree(vshTableRowPtr row)
         return;
 
     for (i = 0; i < row->ncells; i++)
-        VIR_FREE(row->cells[i]);
+        g_free(row->cells[i]);
 
-    VIR_FREE(row->cells);
-    VIR_FREE(row);
+    g_free(row->cells);
+    g_free(row);
 }
 
 
@@ -69,8 +69,8 @@ vshTableFree(vshTablePtr table)
 
     for (i = 0; i < table->nrows; i++)
         vshTableRowFree(table->rows[i]);
-    VIR_FREE(table->rows);
-    VIR_FREE(table);
+    g_free(table->rows);
+    g_free(table);
 }
 
 

diff --git a/tools/vsh.c b/tools/vsh.c
index 0e2d4955b4a710c25135f9f2dfc431bcfdce48e2..202bd564f7c00c7261484040e4d28f0dc154d64e 100644 (file)
--- a/tools/vsh.c
+++ b/tools/vsh.c
@@ -719,8 +719,8 @@ vshCommandOptFree(vshCmdOpt * arg)
 
         a = a->next;
 
-        VIR_FREE(tmp->data);
-        VIR_FREE(tmp);
+        g_free(tmp->data);
+        g_free(tmp);
     }
 }
 
@@ -735,7 +735,7 @@ vshCommandFree(vshCmd *cmd)
         c = c->next;
 
         vshCommandOptFree(tmp->opts);
-        VIR_FREE(tmp);
+        g_free(tmp);
     }
 }