From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 27 Jan 2022 12:54:57 +0000 (+0100)
Subject: virshEventPrint: Use automatic memory clearing
X-Git-Tag: v8.2.0-rc1~221
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf9de8cb51e42ea3a24d10687d0b399e8ecd9c72;p=thirdparty%2Flibvirt.git

virshEventPrint: Use automatic memory clearing

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 25097627ac..33984618eb 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -13166,13 +13166,13 @@ static void
 virshEventPrint(virshDomEventData *data,
                 virBuffer *buf)
 {
-    char *msg;
+    g_autofree char *msg = NULL;
 
     if (!(msg = virBufferContentAndReset(buf)))
         return;
 
     if (!data->loop && *data->count)
-        goto cleanup;
+        return;
 
     if (data->timestamp) {
         char timestamp[VIR_TIME_STRING_BUFLEN];
@@ -13188,9 +13188,6 @@ virshEventPrint(virshDomEventData *data,
     (*data->count)++;
     if (!data->loop)
         vshEventDone(data->ctl);
-
- cleanup:
-    VIR_FREE(msg);
 }
 
 static void