From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 1 Mar 2021 10:09:02 +0000 (+0100)
Subject: commandtest: test27: Remove pointless 'cleanup' label
X-Git-Tag: v7.2.0-rc1~217
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9eec3714c986212c66889ff1b3886548e7445ea;p=thirdparty%2Flibvirt.git

commandtest: test27: Remove pointless 'cleanup' label

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/tests/commandtest.c b/tests/commandtest.c
index 524c959eba..aaf391935c 100644
--- a/tests/commandtest.c
+++ b/tests/commandtest.c
@@ -1041,7 +1041,6 @@ static int test27(const void *unused G_GNUC_UNUSED)
     g_autoptr(virCommand) cmd = virCommandNew(abs_builddir "/commandhelper");
     int buf1fd;
     int buf2fd;
-    int ret = -1;
     size_t buflen = 1024 * 128;
     g_autofree char *buffer0 = NULL;
     g_autofree char *buffer1 = NULL;
@@ -1093,29 +1092,25 @@ static int test27(const void *unused G_GNUC_UNUSED)
 
     if (virCommandRun(cmd, NULL) < 0) {
         printf("Cannot run child %s\n", virGetLastErrorMessage());
-        goto cleanup;
+        return -1;
     }
 
     if (!outactual || !erractual)
-        goto cleanup;
+        return -1;
 
     if (STRNEQ(outactual, outexpect)) {
         virTestDifference(stderr, outexpect, outactual);
-        goto cleanup;
+        return -1;
     }
     if (STRNEQ(erractual, errexpect)) {
         virTestDifference(stderr, errexpect, erractual);
-        goto cleanup;
+        return -1;
     }
 
     if (checkoutput("test27") < 0)
-        goto cleanup;
-
-    ret = 0;
-
- cleanup:
+        return -1;
 
-    return ret;
+    return 0;
 }