util: convert VIR_FREE to g_free in other functions that free their arg

Signed-off-by: Laine Stump <laine@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/util/virconf.c b/src/util/virconf.c
index d85fc32b647c545b72f2ca78665debc0835a7e9d..16107bce96a064651a86f5e64cd86f5a005e1147 100644 (file)
--- a/src/util/virconf.c
+++ b/src/util/virconf.c
@@ -151,11 +151,11 @@ virConfFreeValue(virConfValuePtr val)
         return;
     if (val->type == VIR_CONF_STRING &&
         val->str != NULL)
-        VIR_FREE(val->str);
+        g_free(val->str);
     if (val->type == VIR_CONF_LIST &&
         val->list != NULL)
         virConfFreeList(val->list);
-    VIR_FREE(val);
+    g_free(val);
 }
 
 virConfPtr

diff --git a/src/util/virerror.c b/src/util/virerror.c
index 14054add41715ea8dd6cbf4993ff19ae1e4483ed..708081414ac253f9a45ddd8dabf0fefafd5baaa5 100644 (file)
--- a/src/util/virerror.c
+++ b/src/util/virerror.c
@@ -158,7 +158,7 @@ virLastErrFreeData(void *data)
     if (!err)
         return;
     virResetError(err);
-    VIR_FREE(err);
+    g_free(err);
 }
 
 
@@ -477,7 +477,7 @@ void
 virFreeError(virErrorPtr err)
 {
     virResetError(err);
-    VIR_FREE(err);
+    g_free(err);
 }
 
 /**

diff --git a/src/util/virobject.c b/src/util/virobject.c
index ce40ffae221ed997b8a64c85beb99fe71f3d0e5b..370a64bd6dc08c933a6933170a99b22eff9aec84 100644 (file)
--- a/src/util/virobject.c
+++ b/src/util/virobject.c
@@ -655,5 +655,5 @@ virObjectListFreeCount(void *list,
     for (i = 0; i < count; i++)
         virObjectUnref(((void **)list)[i]);
 
-    VIR_FREE(list);
+    g_free(list);
 }

diff --git a/src/util/virstring.c b/src/util/virstring.c
index c98435388a7b4b950da6f88d3800f58b3f87872f..c3e64007fefadee3bc3ea13bd906e41740aab4ed 100644 (file)
--- a/src/util/virstring.c
+++ b/src/util/virstring.c
@@ -108,9 +108,9 @@ virStringListFreeCount(char **strings,
         return;
 
     for (i = 0; i < count; i++)
-        VIR_FREE(strings[i]);
+        g_free(strings[i]);
 
-    VIR_FREE(strings);
+    g_free(strings);
 }