Re: [PATCH 05/15] virbitmaptest: test13: Refactor memory cleanup

Move scope of variables and get rid of the 'cleanup' section. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- tests/virbitmaptest.c | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/tests/virbitmaptest.c b/tests/virbitmaptest.c index e1a49bfe35..1578cd0612 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; + fprintf(stderr, "\n expected bitmap string '%s' actual string '%s'\n", + strings[i], str);

+ return -1; } -