From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 7 Jun 2019 08:27:50 +0000 (+0200)
Subject: tests: Refactor cleanup in qemuMonitorTestProcessCommandVerbatim
X-Git-Tag: v5.5.0-rc1~327
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4013f9ff7f4fe5598d6319d368d32ba1159fcb2;p=thirdparty%2Flibvirt.git

tests: Refactor cleanup in qemuMonitorTestProcessCommandVerbatim

Use VIR_AUTOFREE and get rid of the cleanup section.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---

diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c
index 4a108c382d..1cd35830af 100644
--- a/tests/qemumonitortestutils.c
+++ b/tests/qemumonitortestutils.c
@@ -688,8 +688,8 @@ qemuMonitorTestProcessCommandVerbatim(qemuMonitorTestPtr test,
                                       const char *cmdstr)
 {
     struct qemuMonitorTestHandlerData *data = item->opaque;
-    char *reformatted = NULL;
-    char *errmsg = NULL;
+    VIR_AUTOFREE(char *) reformatted = NULL;
+    VIR_AUTOFREE(char *) errmsg = NULL;
     int ret = -1;
 
     /* JSON strings will be reformatted to simplify checking */
@@ -705,7 +705,7 @@ qemuMonitorTestProcessCommandVerbatim(qemuMonitorTestPtr test,
     } else {
         if (data->cmderr) {
             if (virAsprintf(&errmsg, "%s: %s", data->cmderr, cmdstr) < 0)
-                goto cleanup;
+                return -1;
 
             ret = qemuMonitorTestAddErrorResponse(test, errmsg);
         } else {
@@ -715,9 +715,6 @@ qemuMonitorTestProcessCommandVerbatim(qemuMonitorTestPtr test,
         }
     }
 
- cleanup:
-    VIR_FREE(errmsg);
-    VIR_FREE(reformatted);
     return ret;
 }