From 5642508732f64821d8e28000dfc87eb85a8b50b2 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Thu, 1 Oct 2020 16:16:21 +0200 Subject: [PATCH] virbitmaptest: test13: Refactor memory cleanup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Move scope of variables and get rid of the 'cleanup' section. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- tests/virbitmaptest.c | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) 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