logging: use g_new0 instead of VIR_ALLOC

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c
index 0649a70c9d6155c6e650d390979039acd7c72019..be93c63eb5c917bfa30efe08c8f3d4975976b15b 100644 (file)
--- a/src/logging/log_daemon.c
+++ b/src/logging/log_daemon.c
@@ -116,8 +116,7 @@ virLogDaemonNew(virLogDaemonConfigPtr config, bool privileged)
     virLogDaemonPtr logd;
     virNetServerPtr srv = NULL;
 
-    if (VIR_ALLOC(logd) < 0)
-        return NULL;
+    logd = g_new0(virLogDaemon, 1);
 
     g_mutex_init(&logd->lock);
 
@@ -214,8 +213,7 @@ virLogDaemonNewPostExecRestart(virJSONValuePtr object, bool privileged,
     virJSONValuePtr child;
     const char *serverNames[] = { "virtlogd" };
 
-    if (VIR_ALLOC(logd) < 0)
-        return NULL;
+    logd = g_new0(virLogDaemon, 1);
 
     g_mutex_init(&logd->lock);
 
@@ -330,8 +328,7 @@ virLogDaemonClientNew(virNetServerClientPtr client,
     unsigned long long timestamp;
     bool privileged = opaque != NULL;
 
-    if (VIR_ALLOC(priv) < 0)
-        return NULL;
+    priv = g_new0(virLogDaemonClient, 1);
 
     g_mutex_init(&priv->lock);
 

diff --git a/src/logging/log_daemon_config.c b/src/logging/log_daemon_config.c
index 97f2de90a609fa3652b9f3894e043d1f89c35f83..5577991b13118de3669873b2f0c9822ef1f2fbb5 100644 (file)
--- a/src/logging/log_daemon_config.c
+++ b/src/logging/log_daemon_config.c
@@ -58,8 +58,7 @@ virLogDaemonConfigNew(bool privileged G_GNUC_UNUSED)
 {
     virLogDaemonConfigPtr data;
 
-    if (VIR_ALLOC(data) < 0)
-        return NULL;
+    data = g_new0(virLogDaemonConfig, 1);
 
     data->max_clients = 1024;
     data->admin_max_clients = 5000;

diff --git a/src/logging/log_handler.c b/src/logging/log_handler.c
index 87748d96d19beb3f9a0a1d9fa1810b854057965e..d47009d68674b049326bc411b3f2f72bcb2cfb38 100644 (file)
--- a/src/logging/log_handler.c
+++ b/src/logging/log_handler.c
@@ -221,8 +221,7 @@ virLogHandlerLogFilePostExecRestart(virLogHandlerPtr handler,
     const char *domuuid;
     const char *tmp;
 
-    if (VIR_ALLOC(file) < 0)
-        return NULL;
+    file = g_new0(virLogHandlerLogFile, 1);
 
     handler->inhibitor(true, handler->opaque);
 
@@ -389,8 +388,7 @@ virLogHandlerDomainOpenLogFile(virLogHandlerPtr handler,
     if (virPipe(pipefd) < 0)
         goto error;
 
-    if (VIR_ALLOC(file) < 0)
-        goto error;
+    file = g_new0(virLogHandlerLogFile, 1);
 
     file->watch = -1;
     file->pipefd = pipefd[0];
@@ -537,8 +535,7 @@ virLogHandlerDomainReadLogFile(virLogHandlerPtr handler,
     if (virRotatingFileReaderSeek(file, inode, offset) < 0)
         goto error;
 
-    if (VIR_ALLOC_N(data, maxlen + 1) < 0)
-        goto error;
+    data = g_new0(char, maxlen + 1);
 
     got = virRotatingFileReaderConsume(file, data, maxlen);
     if (got < 0)

diff --git a/src/logging/log_manager.c b/src/logging/log_manager.c
index fd7c2922b3a5e84fe43fe95b2743a63511ef11d7..57be340a2d6a36c2c52500aaed8fc91241e157f9 100644 (file)
--- a/src/logging/log_manager.c
+++ b/src/logging/log_manager.c
@@ -113,8 +113,7 @@ virLogManagerNew(bool privileged)
 {
     virLogManagerPtr mgr;
 
-    if (VIR_ALLOC(mgr) < 0)
-        goto error;
+    mgr = g_new0(virLogManager, 1);
 
     if (!(mgr->client = virLogManagerConnect(privileged, &mgr->program)))
         goto error;