[libvirt PATCH 12/21] logging: replace VIR_FREE with g_free in all vir*Free() functions

Laine Stump laine at redhat.com
Thu Feb 4 03:29:08 UTC 2021


Signed-off-by: Laine Stump <laine at redhat.com>
---
 src/logging/log_daemon.c        | 4 ++--
 src/logging/log_daemon_config.c | 6 +++---
 src/logging/log_handler.c       | 6 +++---
 src/logging/log_manager.c       | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c
index 6b8f3b6fe5..770f6dd273 100644
--- a/src/logging/log_daemon.c
+++ b/src/logging/log_daemon.c
@@ -89,7 +89,7 @@ virLogDaemonFree(virLogDaemonPtr logd)
     g_mutex_clear(&logd->lock);
     virObjectUnref(logd->dmn);
 
-    VIR_FREE(logd);
+    g_free(logd);
 }
 
 
@@ -314,7 +314,7 @@ virLogDaemonClientFree(void *opaque)
               (unsigned long long)priv->clientPid);
 
     g_mutex_clear(&priv->lock);
-    VIR_FREE(priv);
+    g_free(priv);
 }
 
 
diff --git a/src/logging/log_daemon_config.c b/src/logging/log_daemon_config.c
index 5577991b13..075cf766ec 100644
--- a/src/logging/log_daemon_config.c
+++ b/src/logging/log_daemon_config.c
@@ -74,10 +74,10 @@ virLogDaemonConfigFree(virLogDaemonConfigPtr data)
     if (!data)
         return;
 
-    VIR_FREE(data->log_filters);
-    VIR_FREE(data->log_outputs);
+    g_free(data->log_filters);
+    g_free(data->log_outputs);
 
-    VIR_FREE(data);
+    g_free(data);
 }
 
 static int
diff --git a/src/logging/log_handler.c b/src/logging/log_handler.c
index 95d909b44e..45a4763525 100644
--- a/src/logging/log_handler.c
+++ b/src/logging/log_handler.c
@@ -98,9 +98,9 @@ virLogHandlerLogFileFree(virLogHandlerLogFilePtr file)
     if (file->watch != -1)
         virEventRemoveHandle(file->watch);
 
-    VIR_FREE(file->driver);
-    VIR_FREE(file->domname);
-    VIR_FREE(file);
+    g_free(file->driver);
+    g_free(file->domname);
+    g_free(file);
 }
 
 
diff --git a/src/logging/log_manager.c b/src/logging/log_manager.c
index 57be340a2d..56927c1d6d 100644
--- a/src/logging/log_manager.c
+++ b/src/logging/log_manager.c
@@ -137,7 +137,7 @@ virLogManagerFree(virLogManagerPtr mgr)
     virObjectUnref(mgr->program);
     virObjectUnref(mgr->client);
 
-    VIR_FREE(mgr);
+    g_free(mgr);
 }
 
 
-- 
2.29.2




More information about the libvir-list mailing list