From fba29dff836d2e7e0fc2fea7010b7fda32b36f25 Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
Date: Sat, 15 Jun 2019 11:58:32 +0200
Subject: [PATCH] tests: qemuMonitorReportError: use tmp variable properly
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

There is no obvious benefit in putting the escaped message
back into msg while tmp holds the original message.

Remove the assignment and use 'tmp' directly'.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
---
 tests/qemumonitortestutils.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c
index bb30bed51e..7d336e1aa7 100644
--- a/tests/qemumonitortestutils.c
+++ b/tests/qemumonitortestutils.c
@@ -213,16 +213,14 @@ qemuMonitorReportError(qemuMonitorTestPtr test, const char *errmsg, ...)
         goto cleanup;
 
     if (test->agent || test->json) {
-        char *tmp = msg;
-        msg = qemuMonitorEscapeArg(tmp);
-        VIR_FREE(tmp);
-        if (!msg)
+        VIR_AUTOFREE(char *) tmp = NULL;
+        if (!(tmp = qemuMonitorEscapeArg(msg)))
             goto cleanup;
 
         if (virAsprintf(&jsonmsg, "{ \"error\": "
                                   " { \"desc\": \"%s\", "
                                   "   \"class\": \"UnexpectedCommand\" } }",
-                                  msg) < 0)
+                                  tmp) < 0)
             goto cleanup;
     } else {
         if (virAsprintf(&jsonmsg, "error: '%s'", msg) < 0)
-- 
2.47.2