[PATCH 6/6] commandtest: test27: Remove pointless 'cleanup' label

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx>
---
 tests/commandtest.c | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

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;
 }


-- 
2.29.2




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux