From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 1 Oct 2020 14:16:21 +0000 (+0200)
Subject: virbitmaptest: test13: Refactor memory cleanup
X-Git-Tag: v6.9.0-rc1~385
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5642508732f64821d8e28000dfc87eb85a8b50b2;p=thirdparty%2Flibvirt.git

virbitmaptest: test13: Refactor memory cleanup

Move scope of variables and get rid of the 'cleanup' section.

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

diff --git a/tests/virbitmaptest.c b/tests/virbitmaptest.c
index e1a49bfe35..996472ee3e 100644
--- a/tests/virbitmaptest.c
+++ b/tests/virbitmaptest.c
@@ -670,37 +670,27 @@ test12(const void *opaque G_GNUC_UNUSED)
 static int
 test13(const void *opaque G_GNUC_UNUSED)
 {
-    virBitmapPtr map = NULL;
     const char *strings[] = { "1234feebee", "000c0fefe" };
-    char *str = NULL;
     size_t i = 0;
-    int ret = -1;
 
     for (i = 0; i < G_N_ELEMENTS(strings); i++) {
-        map = virBitmapNewString(strings[i]);
-        if (!map)
-            goto cleanup;
+        g_autoptr(virBitmap) map = NULL;
+        g_autofree char *str = NULL;
 
-        str = virBitmapToString(map);
-        if (!str)
-            goto cleanup;
+        if (!(map = virBitmapNewString(strings[i])))
+            return -1;
+
+        if (!(str = virBitmapToString(map)))
+            return -1;
 
         if (STRNEQ(strings[i], str)) {
             fprintf(stderr, "\n expected bitmap string '%s' actual string "
                     "'%s'\n", strings[i], str);
-            goto cleanup;
+            return -1;
         }
-
-        VIR_FREE(str);
-        virBitmapFree(map);
-        map = NULL;
     }
 
-    ret = 0;
- cleanup:
-    VIR_FREE(str);
-    virBitmapFree(map);
-    return ret;
+    return 0;
 }
 
 #undef TEST_MAP