From: Kristina Hanicova <khanicov@redhat.com>
Date: Wed, 3 Mar 2021 10:48:15 +0000 (+0100)
Subject: vsh-table: Use g_autofree where possible
X-Git-Tag: v7.2.0-rc1~249
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d64f3f763f638b6f8b89debfa47da1837a99b3c8;p=thirdparty%2Flibvirt.git

vsh-table: Use g_autofree where possible

In: vshTableRowNew(), vshTablePrint(), vshTablePrintToStdout().

Signed-off-by: Kristina Hanicova <khanicov@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/tools/vsh-table.c b/tools/vsh-table.c
index d09cc9e14e..c5e57c0d7b 100644
--- a/tools/vsh-table.c
+++ b/tools/vsh-table.c
@@ -98,14 +98,12 @@ vshTableRowNew(const char *arg, va_list ap)
     row = g_new0(vshTableRow, 1);
 
     while (arg) {
-        char *tmp = NULL;
+        g_autofree char *tmp = NULL;
 
         tmp = g_strdup(arg);
 
-        if (VIR_APPEND_ELEMENT(row->cells, row->ncells, tmp) < 0) {
-            VIR_FREE(tmp);
+        if (VIR_APPEND_ELEMENT(row->cells, row->ncells, tmp) < 0)
             goto error;
-        }
 
         arg = va_arg(ap, const char *);
     }
@@ -361,7 +359,7 @@ vshTablePrint(vshTablePtr table, bool header)
 {
     size_t i;
     size_t j;
-    size_t *maxwidths;
+    g_autofree size_t *maxwidths = NULL;
     size_t **widths;
     g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
     char *ret = NULL;
@@ -395,7 +393,6 @@ vshTablePrint(vshTablePtr table, bool header)
     ret = virBufferContentAndReset(&buf);
 
  cleanup:
-    VIR_FREE(maxwidths);
     for (i = 0; i < table->nrows; i++)
         VIR_FREE(widths[i]);
     VIR_FREE(widths);
@@ -416,15 +413,13 @@ void
 vshTablePrintToStdout(vshTablePtr table, vshControl *ctl)
 {
     bool header;
-    char *out;
+    g_autofree char *out = NULL;
 
     header = ctl ? !ctl->quiet : true;
 
     out = vshTablePrintToString(table, header);
     if (out)
         vshPrint(ctl, "%s", out);
-
-    VIR_FREE(out);
 }