From 4739de290d3001d7a8100b5e63bc678a53d8dc95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
Date: Sat, 4 Sep 2021 22:39:45 +0200
Subject: [PATCH] tests: libxl: remove pointless labels
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Laine Stump <laine@redhat.com>
---
 tests/xlconfigtest.c | 48 ++++++++++++++++++--------------------------
 tests/xmconfigtest.c | 37 +++++++++++++---------------------
 2 files changed, 34 insertions(+), 51 deletions(-)

diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c
index 6717377982..d6505f9e12 100644
--- a/tests/xlconfigtest.c
+++ b/tests/xlconfigtest.c
@@ -68,47 +68,43 @@ testCompareParseXML(const char *xlcfg, const char *xml, bool replaceVars)
     g_autoptr(virConf) conf = NULL;
     g_autoptr(virConnect) conn = NULL;
     int wrote = 4096;
-    int ret = -1;
     g_autoptr(virDomainDef) def = NULL;
     g_autofree char *replacedXML = NULL;
 
     gotxlcfgData = g_new0(char, wrote);
 
     conn = virGetConnect();
-    if (!conn) goto fail;
+    if (!conn)
+        return -1;
 
     if (replaceVars) {
         if (!(replacedXML = testReplaceVarsXML(xml)))
-            goto fail;
+            return -1;
         if (!(def = virDomainDefParseString(replacedXML, driver->xmlopt,
                                             NULL, VIR_DOMAIN_XML_INACTIVE)))
-            goto fail;
+            return -1;
     } else {
         if (!(def = virDomainDefParseFile(xml, driver->xmlopt,
                                           NULL, VIR_DOMAIN_XML_INACTIVE)))
-            goto fail;
+            return -1;
     }
 
     if (!virDomainDefCheckABIStability(def, def, driver->xmlopt)) {
         fprintf(stderr, "ABI stability check failed on %s", xml);
-        goto fail;
+        return -1;
     }
 
     if (!(conf = xenFormatXL(def, conn)))
-        goto fail;
+        return -1;
 
     if (virConfWriteMem(gotxlcfgData, &wrote, conf) < 0)
-        goto fail;
+        return -1;
     gotxlcfgData[wrote] = '\0';
 
     if (virTestCompareToFile(gotxlcfgData, xlcfg) < 0)
-        goto fail;
+        return -1;
 
-    ret = 0;
-
- fail:
-
-    return ret;
+    return 0;
 }
 
 /*
@@ -121,44 +117,40 @@ testCompareFormatXML(const char *xlcfg, const char *xml, bool replaceVars)
     g_autofree char *xlcfgData = NULL;
     g_autofree char *gotxml = NULL;
     g_autoptr(virConf) conf = NULL;
-    int ret = -1;
     g_autoptr(virConnect) conn = NULL;
     g_autoptr(virDomainDef) def = NULL;
     g_autofree char *replacedXML = NULL;
     g_autoptr(libxlDriverConfig) cfg = libxlDriverConfigGet(driver);
 
     conn = virGetConnect();
-    if (!conn) goto fail;
+    if (!conn)
+        return -1;
 
     if (virTestLoadFile(xlcfg, &xlcfgData) < 0)
-        goto fail;
+        return -1;
 
     if (!(conf = virConfReadString(xlcfgData, 0)))
-        goto fail;
+        return -1;
 
     if (!(def = xenParseXL(conf, cfg->caps, driver->xmlopt)))
-        goto fail;
+        return -1;
 
     if (!(gotxml = virDomainDefFormat(def, driver->xmlopt,
                                       VIR_DOMAIN_XML_INACTIVE |
                                       VIR_DOMAIN_XML_SECURE)))
-        goto fail;
+        return -1;
 
     if (replaceVars) {
         if (!(replacedXML = testReplaceVarsXML(xml)))
-            goto fail;
+            return -1;
         if (virTestCompareToString(gotxml, replacedXML) < 0)
-            goto fail;
+            return -1;
     } else {
         if (virTestCompareToFile(gotxml, xml) < 0)
-            goto fail;
+            return -1;
     }
 
-    ret = 0;
-
- fail:
-
-    return ret;
+    return 0;
 }
 
 
diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c
index bd23e5fd5d..c99d1f2bd9 100644
--- a/tests/xmconfigtest.c
+++ b/tests/xmconfigtest.c
@@ -41,7 +41,6 @@ testCompareParseXML(const char *xmcfg, const char *xml)
 {
     g_autofree char *gotxmcfgData = NULL;
     g_autoptr(virConf) conf = NULL;
-    int ret = -1;
     g_autoptr(virConnect) conn = NULL;
     int wrote = 4096;
     g_autoptr(virDomainDef) def = NULL;
@@ -49,32 +48,29 @@ testCompareParseXML(const char *xmcfg, const char *xml)
     gotxmcfgData = g_new0(char, wrote);
 
     conn = virGetConnect();
-    if (!conn) goto fail;
+    if (!conn)
+        return -1;
 
     if (!(def = virDomainDefParseFile(xml, driver->xmlopt, NULL,
                                       VIR_DOMAIN_DEF_PARSE_INACTIVE)))
-        goto fail;
+        return -1;
 
     if (!virDomainDefCheckABIStability(def, def, driver->xmlopt)) {
         fprintf(stderr, "ABI stability check failed on %s", xml);
-        goto fail;
+        return -1;
     }
 
     if (!(conf = xenFormatXM(conn, def)))
-        goto fail;
+        return -1;
 
     if (virConfWriteMem(gotxmcfgData, &wrote, conf) < 0)
-        goto fail;
+        return -1;
     gotxmcfgData[wrote] = '\0';
 
     if (virTestCompareToFile(gotxmcfgData, xmcfg) < 0)
-        goto fail;
+        return -1;
 
-    ret = 0;
-
- fail:
-
-    return ret;
+    return 0;
 }
 
 static int
@@ -83,30 +79,25 @@ testCompareFormatXML(const char *xmcfg, const char *xml)
     g_autofree char *xmcfgData = NULL;
     g_autofree char *gotxml = NULL;
     g_autoptr(virConf) conf = NULL;
-    int ret = -1;
     g_autoptr(virDomainDef) def = NULL;
     g_autoptr(libxlDriverConfig) cfg = libxlDriverConfigGet(driver);
 
     if (virTestLoadFile(xmcfg, &xmcfgData) < 0)
-        goto fail;
+        return -1;
 
     if (!(conf = virConfReadString(xmcfgData, 0)))
-        goto fail;
+        return -1;
 
     if (!(def = xenParseXM(conf, cfg->caps, driver->xmlopt)))
-        goto fail;
+        return -1;
 
     if (!(gotxml = virDomainDefFormat(def, driver->xmlopt, VIR_DOMAIN_DEF_FORMAT_SECURE)))
-        goto fail;
+        return -1;
 
     if (virTestCompareToFile(gotxml, xml) < 0)
-        goto fail;
+        return -1;
 
-    ret = 0;
-
- fail:
-
-    return ret;
+    return 0;
 }