From 8b0a389d2b8b8ba792cc9b20282a73a5a2574a6a Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 17 Jun 2019 16:10:12 +0200
Subject: [PATCH] qemu: Refactor qemuDomainDefNamespaceParse
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Rename 'cmd' to 'nsdef' and improve the control flow.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
 src/qemu/qemu_domain.c | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 484d1747d2..4fe84253bc 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -3201,8 +3201,8 @@ qemuDomainDefNamespaceParse(xmlDocPtr xml ATTRIBUTE_UNUSED,
                             xmlXPathContextPtr ctxt,
                             void **data)
 {
-    qemuDomainXmlNsDefPtr cmd = NULL;
-    bool uses_qemu_ns = false;
+    qemuDomainXmlNsDefPtr nsdata = NULL;
+    int ret = -1;
 
     if (xmlXPathRegisterNs(ctxt, BAD_CAST "qemu", BAD_CAST QEMU_NAMESPACE_HREF) < 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
@@ -3211,26 +3211,21 @@ qemuDomainDefNamespaceParse(xmlDocPtr xml ATTRIBUTE_UNUSED,
         return -1;
     }
 
-    if (VIR_ALLOC(cmd) < 0)
+    if (VIR_ALLOC(nsdata) < 0)
         return -1;
 
-    if (qemuDomainDefNamespaceParseCommandlineArgs(cmd, ctxt) < 0 ||
-        qemuDomainDefNamespaceParseCommandlineEnv(cmd, ctxt) < 0)
-        goto error;
-
-    if (cmd->num_args > 0 || cmd->num_env > 0)
-        uses_qemu_ns = true;
+    if (qemuDomainDefNamespaceParseCommandlineArgs(nsdata, ctxt) < 0 ||
+        qemuDomainDefNamespaceParseCommandlineEnv(nsdata, ctxt) < 0)
+        goto cleanup;
 
-    if (uses_qemu_ns)
-        *data = cmd;
-    else
-        VIR_FREE(cmd);
+    if (nsdata->num_args > 0 || nsdata->num_env > 0)
+        VIR_STEAL_PTR(*data, nsdata);
 
-    return 0;
+    ret = 0;
 
- error:
-    qemuDomainDefNamespaceFree(cmd);
-    return -1;
+ cleanup:
+    qemuDomainDefNamespaceFree(nsdata);
+    return ret;
 }
 
 static int
-- 
GitLab