[PATCH 07/15] virbitmaptest: Remove unnecessary error/cleanup labels

Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- tests/virbitmaptest.c | 264 +++++++++++++++++------------------------- 1 file changed, 108 insertions(+), 156 deletions(-) diff --git a/tests/virbitmaptest.c b/tests/virbitmaptest.c index bfca208a7f..56110971c9 100644 --- a/tests/virbitmaptest.c +++ b/tests/virbitmaptest.c @@ -33,32 +33,28 @@ test1(const void *data G_GNUC_UNUSED) int size; int bit; bool result; - int ret = -1; size = 1024; bit = 100; if (!(bitmap = virBitmapNew(size))) - goto error; + return -1; if (virBitmapSetBit(bitmap, bit) < 0) - goto error; + return -1; if (virBitmapGetBit(bitmap, bit, &result) < 0) - goto error; + return -1; if (!result) - goto error; + return -1; if (virBitmapGetBit(bitmap, bit + 1, &result) < 0) - goto error; + return -1; if (result) - goto error; - - ret = 0; + return -1; - error: - return ret; + return 0; } static int @@ -86,85 +82,78 @@ test2(const void *data G_GNUC_UNUSED) const char *bitsString1 = "1-32,50,88-99,1021-1023"; g_autofree char *bitsString2 = NULL; g_autoptr(virBitmap) bitmap = NULL; - int ret = -1; int size = 1025; if (virBitmapParse(bitsString1, &bitmap, size) < 0) - goto error; + return -1; if (testBit(bitmap, 1, 32, true) < 0) - goto error; + return -1; if (testBit(bitmap, 50, 50, true) < 0) - goto error; + return -1; if (testBit(bitmap, 88, 99, true) < 0) - goto error; + return -1; if (testBit(bitmap, 1021, 1023, true) < 0) - goto error; + return -1; if (testBit(bitmap, 0, 0, false) < 0) - goto error; + return -1; if (testBit(bitmap, 33, 49, false) < 0) - goto error; + return -1; if (testBit(bitmap, 51, 87, false) < 0) - goto error; + return -1; if (testBit(bitmap, 100, 1020, false) < 0) - goto error; + return -1; if (virBitmapCountBits(bitmap) != 48) - goto error; + return -1; if (!(bitsString2 = virBitmapFormat(bitmap))) - goto error; + return -1; if (strcmp(bitsString1, bitsString2)) - goto error; + return -1; virBitmapSetAll(bitmap); if (testBit(bitmap, 0, size - 1, true) < 0) - goto error; + return -1; if (virBitmapCountBits(bitmap) != size) - goto error; + return -1; if (!virBitmapIsAllSet(bitmap)) - goto error; + return -1; virBitmapClearAll(bitmap); if (!virBitmapIsAllClear(bitmap)) - goto error; + return -1; if (testBit(bitmap, 0, size - 1, false) < 0) - goto error; + return -1; if (virBitmapCountBits(bitmap) != 0) - goto error; - - ret = 0; + return -1; - error: - return ret; + return 0; } static int test3(const void *data G_GNUC_UNUSED) { g_autoptr(virBitmap) bitmap = NULL; - int ret = -1; int size = 5; size_t i; if ((bitmap = virBitmapNew(size)) == NULL) - goto error; + return -1; for (i = 0; i < size; i++) ignore_value(virBitmapSetBit(bitmap, i)); if (!virBitmapIsAllSet(bitmap)) - goto error; + return -1; virBitmapClearAll(bitmap); if (!virBitmapIsAllClear(bitmap)) - goto error; - ret = 0; + return -1; - error: - return ret; + return 0; } /* test for virBitmapNextSetBit, virBitmapLastSetBit, virBitmapNextClearBit */ @@ -185,20 +174,20 @@ test4(const void *data G_GNUC_UNUSED) ssize_t i, j; if (G_N_ELEMENTS(bitsPos) + G_N_ELEMENTS(bitsPosInv) != size) - goto error; + return -1; /* 0. empty set */ bitmap = virBitmapNewEmpty(); if (virBitmapNextSetBit(bitmap, -1) != -1) - goto error; + return -1; if (virBitmapLastSetBit(bitmap) != -1) - goto error; + return -1; if (virBitmapNextClearBit(bitmap, -1) != -1) - goto error; + return -1; virBitmapFree(bitmap); bitmap = NULL; @@ -207,23 +196,23 @@ test4(const void *data G_GNUC_UNUSED) bitmap = virBitmapNew(size); if (!bitmap) - goto error; + return -1; if (virBitmapNextSetBit(bitmap, -1) != -1) - goto error; + return -1; if (virBitmapLastSetBit(bitmap) != -1) - goto error; + return -1; for (i = 0; i < size; i++) { if (virBitmapNextClearBit(bitmap, i - 1) != i) - goto error; + return -1; } if (virBitmapNextClearBit(bitmap, i) != -1) - goto error; + return -1; if (!virBitmapIsAllClear(bitmap)) - goto error; + return -1; virBitmapFree(bitmap); bitmap = NULL; @@ -231,9 +220,9 @@ test4(const void *data G_GNUC_UNUSED) /* 2. partial set */ if (virBitmapParse(bitsString, &bitmap, size) < 0) - goto error; + return -1; if (!bitmap) - goto error; + return -1; j = 0; i = -1; @@ -241,16 +230,16 @@ test4(const void *data G_GNUC_UNUSED) while (j < G_N_ELEMENTS(bitsPos)) { i = virBitmapNextSetBit(bitmap, i); if (i != bitsPos[j++]) - goto error; + return -1; } if (virBitmapNextSetBit(bitmap, i) != -1) - goto error; + return -1; j = sizeof(bitsPos)/sizeof(int) - 1; if (virBitmapLastSetBit(bitmap) != bitsPos[j]) - goto error; + return -1; j = 0; i = -1; @@ -258,11 +247,11 @@ test4(const void *data G_GNUC_UNUSED) while (j < G_N_ELEMENTS(bitsPosInv)) { i = virBitmapNextClearBit(bitmap, i); if (i != bitsPosInv[j++]) - goto error; + return -1; } if (virBitmapNextClearBit(bitmap, i) != -1) - goto error; + return -1; /* 3. full set */ @@ -270,21 +259,18 @@ test4(const void *data G_GNUC_UNUSED) for (i = 0; i < size; i++) { if (virBitmapNextSetBit(bitmap, i - 1) != i) - goto error; + return -1; } if (virBitmapNextSetBit(bitmap, i) != -1) - goto error; + return -1; if (virBitmapLastSetBit(bitmap) != size - 1) - goto error; + return -1; if (virBitmapNextClearBit(bitmap, -1) != -1) - goto error; + return -1; return 0; - - error: - return -1; } /* test for virBitmapNewData/ToData/DataFormat */ @@ -298,28 +284,27 @@ test5(const void *v G_GNUC_UNUSED) g_autoptr(virBitmap) bitmap = NULL; size_t i; ssize_t j; - int ret = -1; g_autofree char *str = NULL; bitmap = virBitmapNewData(data, sizeof(data)); if (!bitmap) - goto error; + return -1; i = 0; j = -1; while (i < sizeof(bits)/sizeof(int) && (j = virBitmapNextSetBit(bitmap, j)) >= 0) { if (j != bits[i++]) - goto error; + return -1; } if (virBitmapNextSetBit(bitmap, j) > 0) - goto error; + return -1; ignore_value(virBitmapSetBit(bitmap, 2)); ignore_value(virBitmapSetBit(bitmap, 15)); if (virBitmapToData(bitmap, &data2, &len2) < 0) - goto error; + return -1; if (len2 != sizeof(data) || data2[0] != 0x05 || @@ -327,21 +312,19 @@ test5(const void *v G_GNUC_UNUSED) data2[2] != 0x00 || data2[3] != 0x00 || data2[4] != 0x04) - goto error; + return -1; if (!(str = virBitmapDataFormat(data, sizeof(data)))) - goto error; + return -1; if (STRNEQ(str, "0,9,34")) - goto error; + return -1; VIR_FREE(str); if (!(str = virBitmapDataFormat(data2, len2))) - goto error; + return -1; if (STRNEQ(str, "0,2,9,15,34")) - goto error; + return -1; - ret = 0; - error: - return ret; + return 0; } @@ -352,28 +335,27 @@ test6(const void *v G_GNUC_UNUSED) g_autoptr(virBitmap) bitmap = NULL; g_autofree char *str = NULL; int size = 64; - int ret = -1; bitmap = virBitmapNew(size); if (!bitmap) - goto error; + return -1; str = virBitmapFormat(bitmap); if (!str) - goto error; + return -1; if (STRNEQ(str, "")) - goto error; + return -1; VIR_FREE(str); ignore_value(virBitmapSetBit(bitmap, 0)); str = virBitmapFormat(bitmap); if (!str) - goto error; + return -1; if (STRNEQ(str, "0")) - goto error; + return -1; VIR_FREE(str); @@ -381,20 +363,20 @@ test6(const void *v G_GNUC_UNUSED) ignore_value(virBitmapSetBit(bitmap, 5)); str = virBitmapFormat(bitmap); if (!str) - goto error; + return -1; if (STRNEQ(str, "0,4-5")) - goto error; + return -1; VIR_FREE(str); ignore_value(virBitmapSetBit(bitmap, 6)); str = virBitmapFormat(bitmap); if (!str) - goto error; + return -1; if (STRNEQ(str, "0,4-6")) - goto error; + return -1; VIR_FREE(str); @@ -404,10 +386,10 @@ test6(const void *v G_GNUC_UNUSED) ignore_value(virBitmapSetBit(bitmap, 16)); str = virBitmapFormat(bitmap); if (!str) - goto error; + return -1; if (STRNEQ(str, "0,4-6,13-16")) - goto error; + return -1; VIR_FREE(str); @@ -415,15 +397,12 @@ test6(const void *v G_GNUC_UNUSED) ignore_value(virBitmapSetBit(bitmap, 63)); str = virBitmapFormat(bitmap); if (!str) - goto error; + return -1; if (STRNEQ(str, "0,4-6,13-16,62-63")) - goto error; - + return -1; - ret = 0; - error: - return ret; + return 0; } static int @@ -438,28 +417,25 @@ test7(const void *v G_GNUC_UNUSED) for (i = 0; i < nmaxBit; i++) { g_autoptr(virBitmap) bitmap = virBitmapNew(maxBit[i]); if (!bitmap) - goto error; + return -1; if (virBitmapIsAllSet(bitmap)) - goto error; + return -1; ignore_value(virBitmapSetBit(bitmap, 1)); if (virBitmapIsAllSet(bitmap)) - goto error; + return -1; virBitmapSetAll(bitmap); if (!virBitmapIsAllSet(bitmap)) - goto error; + return -1; virBitmapClearAll(bitmap); if (!virBitmapIsAllClear(bitmap)) - goto error; + return -1; } return 0; - - error: - return -1; } static int @@ -467,24 +443,21 @@ test8(const void *v G_GNUC_UNUSED) { g_autoptr(virBitmap) bitmap = NULL; char data[108] = {0x00,}; - int ret = -1; bitmap = virBitmapNewData(data, sizeof(data)); if (!bitmap) - goto cleanup; + return -1; if (!virBitmapIsAllClear(bitmap)) - goto cleanup; + return -1; if (virBitmapSetBit(bitmap, 11) < 0) - goto cleanup; + return -1; if (virBitmapIsAllClear(bitmap)) - goto cleanup; + return -1; - ret = 0; - cleanup: - return ret; + return 0; } @@ -492,37 +465,32 @@ test8(const void *v G_GNUC_UNUSED) static int test9(const void *opaque G_GNUC_UNUSED) { - int ret = -1; g_autoptr(virBitmap) bitmap = NULL; if (virBitmapParse("100000000", &bitmap, 20) != -1) - goto cleanup; + return -1; if (bitmap) - goto cleanup; + return -1; if (virBitmapParse("1-1000000000", &bitmap, 20) != -1) - goto cleanup; + return -1; if (bitmap) - goto cleanup; + return -1; if (virBitmapParse("1-10^10000000000", &bitmap, 20) != -1) - goto cleanup; + return -1; if (bitmap) - goto cleanup; - - ret = 0; - cleanup: - return ret; + return -1; + return 0; } static int test10(const void *opaque G_GNUC_UNUSED) { - int ret = -1; g_autoptr(virBitmap) b1 = NULL; g_autoptr(virBitmap) b2 = NULL; g_autoptr(virBitmap) b3 = NULL; @@ -532,10 +500,10 @@ test10(const void *opaque G_GNUC_UNUSED) virBitmapParse("4,9,10,16-19", &b2, 20) < 0 || virBitmapParse("15", &b3, 20) < 0 || virBitmapParse("0,^0", &b4, 20) < 0) - goto cleanup; + return -1; if (!virBitmapIsAllClear(b4)) - goto cleanup; + return -1; if (virBitmapOverlaps(b1, b2) || virBitmapOverlaps(b1, b4) || @@ -543,11 +511,9 @@ test10(const void *opaque G_GNUC_UNUSED) virBitmapOverlaps(b2, b4) || !virBitmapOverlaps(b1, b3) || virBitmapOverlaps(b3, b4)) - goto cleanup; + return -1; - ret = 0; - cleanup: - return ret; + return 0; } struct testBinaryOpData { @@ -563,12 +529,11 @@ test11(const void *opaque) g_autoptr(virBitmap) amap = NULL; g_autoptr(virBitmap) bmap = NULL; g_autoptr(virBitmap) resmap = NULL; - int ret = -1; if (virBitmapParse(data->a, &amap, 256) < 0 || virBitmapParse(data->b, &bmap, 256) < 0 || virBitmapParse(data->res, &resmap, 256) < 0) - goto cleanup; + return -1; virBitmapIntersect(amap, bmap); @@ -576,14 +541,10 @@ test11(const void *opaque) fprintf(stderr, "\n bitmap intersection failed: intersect('%s','%s') !='%s'\n", data->a, data->b, data->res); - goto cleanup; + return -1; } - ret = 0; - - cleanup: - - return ret; + return 0; } #define TEST_MAP(sz, expect) \ @@ -592,7 +553,7 @@ test11(const void *opaque) if (virBitmapSize(map) != sz) { \ fprintf(stderr, "\n expected bitmap size: '%d' actual size: " \ "'%zu'\n", sz, virBitmapSize(map)); \ - goto cleanup; \ + return -1; \ } \ \ actual = virBitmapFormat(map); \ @@ -601,7 +562,7 @@ test11(const void *opaque) fprintf(stderr, "\n expected bitmap contents '%s' actual contents "\ "'%s'\n", NULLSTR(expect), NULLSTR(actual)); \ VIR_FREE(actual); \ - goto cleanup; \ + return -1; \ } \ VIR_FREE(actual); \ } while (0) @@ -611,23 +572,22 @@ static int test12(const void *opaque G_GNUC_UNUSED) { g_autoptr(virBitmap) map = virBitmapNewEmpty(); - int ret = -1; TEST_MAP(0, ""); if (virBitmapSetBitExpand(map, 128) < 0) - goto cleanup; + return -1; TEST_MAP(129, "128"); if (virBitmapClearBitExpand(map, 150) < 0) - goto cleanup; + return -1; TEST_MAP(151, "128"); virBitmapFree(map); if (!(map = virBitmapParseUnlimited("34,1023"))) - goto cleanup; + return -1; TEST_MAP(1024, "34,1023"); @@ -637,10 +597,7 @@ test12(const void *opaque G_GNUC_UNUSED) virBitmapShrink(map, 34); TEST_MAP(34, ""); - ret = 0; - - cleanup: - return ret; + return 0; } @@ -680,12 +637,11 @@ test14(const void *opaque) g_autoptr(virBitmap) amap = NULL; g_autoptr(virBitmap) bmap = NULL; g_autoptr(virBitmap) resmap = NULL; - int ret = -1; if (virBitmapParse(data->a, &amap, 256) < 0 || virBitmapParse(data->b, &bmap, 256) < 0 || virBitmapParse(data->res, &resmap, 256) < 0) - goto cleanup; + return -1; virBitmapSubtract(amap, bmap); @@ -693,14 +649,10 @@ test14(const void *opaque) fprintf(stderr, "\n bitmap subtraction failed: '%s' - '%s' != '%s'\n", data->a, data->b, data->res); - goto cleanup; + return -1; } - ret = 0; - - cleanup: - - return ret; + return 0; } /* virBitmapUnion() */ -- 2.26.2