From nobody Sun Feb 8 20:17:34 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1601898601; cv=none; d=zohomail.com; s=zohoarc; b=TMYWyWNse4XbB0WfmBdq6Fwg5BOwZ3OE0u8tp0K7WYdOi9M58Z9Y9gSsnSiGSazXzZFuWKSbARhpAKvuB3Lj8Uw3knue9MdSrbIma8ZQxv33V6CmtxZkHywpIhNJGhdZvTgpLO5ZAzZwZGLXSP3FGnh0g6LsncpETfwsqryx7Uo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601898601; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3Kv/k8uE7e6sY/XmlPXcWl4kFgNF4Cw25POwYa6LsQY=; b=G7vwQuWkTGKOa60FKtte/b05zXsSLaNfkFNHiPm1jRZXXSto8TszQL3jPLJBXFBUFd8A8DcUfvGuh/E5BMDwxPTU0/wGAww+cRaHCWQf7O6YPGCsSpuZLVy2yf3fjJ1KenO4LPuzGZGgOabB8fF5GOvGTBuZdrN/zuA/Am7djDg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1601898601524155.27134785695932; Mon, 5 Oct 2020 04:50:01 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-398--iQKzqL1PsaaqcaF5HC0NQ-1; Mon, 05 Oct 2020 07:49:57 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B858E8030AE; Mon, 5 Oct 2020 11:49:49 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 96F2B60C05; Mon, 5 Oct 2020 11:49:49 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 38AE244A63; Mon, 5 Oct 2020 11:49:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 095Bnkxh028115 for ; Mon, 5 Oct 2020 07:49:46 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0EA0219C4F; Mon, 5 Oct 2020 11:49:46 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 413281A8EC for ; Mon, 5 Oct 2020 11:49:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601898600; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=3Kv/k8uE7e6sY/XmlPXcWl4kFgNF4Cw25POwYa6LsQY=; b=WDeGxOVytdzCUA9ld6w1sejqaJEbSE/44l0c3dHdnUiArXy2uG0DBSMLBycSs0SlArEwEk ldsV2pTb4mpwOc+ap2whrWgA5VbtlxOEjFsvoQXA/vhKCSUeN0BAeyYKmaAWxn02KHN5C3 R5eB+AGLrDGqJpm6hRh0DkT6GMzBn50= X-MC-Unique: -iQKzqL1PsaaqcaF5HC0NQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v2 7/7] virbitmaptest: Remove unnecessary error/cleanup labels Date: Mon, 5 Oct 2020 13:49:29 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- tests/virbitmaptest.c | 270 +++++++++++++++++------------------------- 1 file changed, 107 insertions(+), 163 deletions(-) diff --git a/tests/virbitmaptest.c b/tests/virbitmaptest.c index fd49ed4c55..3559e61be7 100644 --- a/tests/virbitmaptest.c +++ b/tests/virbitmaptest.c @@ -58,32 +58,28 @@ test1(const void *data G_GNUC_UNUSED) int size; int bit; bool result; - int ret =3D -1; size =3D 1024; bit =3D 100; if (!(bitmap =3D 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 =3D 0; + return -1; - error: - return ret; + return 0; } static int @@ -111,85 +107,78 @@ test2(const void *data G_GNUC_UNUSED) const char *bitsString1 =3D "1-32,50,88-99,1021-1023"; g_autofree char *bitsString2 =3D NULL; g_autoptr(virBitmap) bitmap =3D NULL; - int ret =3D -1; int size =3D 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) !=3D 48) - goto error; + return -1; if (!(bitsString2 =3D 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) !=3D 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) !=3D 0) - goto error; - - ret =3D 0; + return -1; - error: - return ret; + return 0; } static int test3(const void *data G_GNUC_UNUSED) { g_autoptr(virBitmap) bitmap =3D NULL; - int ret =3D -1; int size =3D 5; size_t i; if ((bitmap =3D virBitmapNew(size)) =3D=3D NULL) - goto error; + return -1; for (i =3D 0; i < size; i++) ignore_value(virBitmapSetBit(bitmap, i)); if (!virBitmapIsAllSet(bitmap)) - goto error; + return -1; virBitmapClearAll(bitmap); if (!virBitmapIsAllClear(bitmap)) - goto error; - ret =3D 0; + return -1; - error: - return ret; + return 0; } /* test for virBitmapNextSetBit, virBitmapLastSetBit, virBitmapNextClearBi= t */ @@ -203,18 +192,15 @@ test4a(const void *data G_GNUC_UNUSED) bitmap =3D virBitmapNewEmpty(); if (virBitmapNextSetBit(bitmap, -1) !=3D -1) - goto error; + return -1; if (virBitmapLastSetBit(bitmap) !=3D -1) - goto error; + return -1; if (virBitmapNextClearBit(bitmap, -1) !=3D -1) - goto error; + return -1; return 0; - - error: - return -1; } @@ -229,28 +215,25 @@ test4b(const void *data G_GNUC_UNUSED) bitmap =3D virBitmapNew(size); if (!bitmap) - goto error; + return -1; if (virBitmapNextSetBit(bitmap, -1) !=3D -1) - goto error; + return -1; if (virBitmapLastSetBit(bitmap) !=3D -1) - goto error; + return -1; for (i =3D 0; i < size; i++) { if (virBitmapNextClearBit(bitmap, i - 1) !=3D i) - goto error; + return -1; } if (virBitmapNextClearBit(bitmap, i) !=3D -1) - goto error; + return -1; if (!virBitmapIsAllClear(bitmap)) - goto error; + return -1; return 0; - - error: - return -1; } @@ -271,14 +254,14 @@ test4c(const void *data G_GNUC_UNUSED) ssize_t i, j; if (G_N_ELEMENTS(bitsPos) + G_N_ELEMENTS(bitsPosInv) !=3D size) - goto error; + return -1; /* 2. partial set */ if (virBitmapParse(bitsString, &bitmap, size) < 0) - goto error; + return -1; if (!bitmap) - goto error; + return -1; j =3D 0; i =3D -1; @@ -286,16 +269,16 @@ test4c(const void *data G_GNUC_UNUSED) while (j < G_N_ELEMENTS(bitsPos)) { i =3D virBitmapNextSetBit(bitmap, i); if (i !=3D bitsPos[j++]) - goto error; + return -1; } if (virBitmapNextSetBit(bitmap, i) !=3D -1) - goto error; + return -1; j =3D sizeof(bitsPos)/sizeof(int) - 1; if (virBitmapLastSetBit(bitmap) !=3D bitsPos[j]) - goto error; + return -1; j =3D 0; i =3D -1; @@ -303,11 +286,11 @@ test4c(const void *data G_GNUC_UNUSED) while (j < G_N_ELEMENTS(bitsPosInv)) { i =3D virBitmapNextClearBit(bitmap, i); if (i !=3D bitsPosInv[j++]) - goto error; + return -1; } if (virBitmapNextClearBit(bitmap, i) !=3D -1) - goto error; + return -1; /* 3. full set */ @@ -315,21 +298,18 @@ test4c(const void *data G_GNUC_UNUSED) for (i =3D 0; i < size; i++) { if (virBitmapNextSetBit(bitmap, i - 1) !=3D i) - goto error; + return -1; } if (virBitmapNextSetBit(bitmap, i) !=3D -1) - goto error; + return -1; if (virBitmapLastSetBit(bitmap) !=3D size - 1) - goto error; + return -1; if (virBitmapNextClearBit(bitmap, -1) !=3D -1) - goto error; + return -1; return 0; - - error: - return -1; } /* test for virBitmapNewData/ToData/DataFormat */ @@ -343,29 +323,28 @@ test5(const void *v G_GNUC_UNUSED) g_autoptr(virBitmap) bitmap =3D NULL; size_t i; ssize_t j; - int ret =3D -1; g_autofree char *actual1 =3D NULL; g_autofree char *actual2 =3D NULL; bitmap =3D virBitmapNewData(data, sizeof(data)); if (!bitmap) - goto error; + return -1; i =3D 0; j =3D -1; while (i < sizeof(bits)/sizeof(int) && (j =3D virBitmapNextSetBit(bitmap, j)) >=3D 0) { if (j !=3D 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 !=3D sizeof(data) || data2[0] !=3D 0x05 || @@ -373,20 +352,18 @@ test5(const void *v G_GNUC_UNUSED) data2[2] !=3D 0x00 || data2[3] !=3D 0x00 || data2[4] !=3D 0x04) - goto error; + return -1; if (!(actual1 =3D virBitmapDataFormat(data, sizeof(data)))) - goto error; + return -1; if (STRNEQ(actual1, "0,9,34")) - goto error; + return -1; if (!(actual2 =3D virBitmapDataFormat(data2, len2))) - goto error; + return -1; if (STRNEQ(actual2, "0,2,9,15,34")) - goto error; + return -1; - ret =3D 0; - error: - return ret; + return 0; } @@ -396,30 +373,29 @@ test6(const void *v G_GNUC_UNUSED) { g_autoptr(virBitmap) bitmap =3D NULL; int size =3D 64; - int ret =3D -1; bitmap =3D virBitmapNew(size); if (!bitmap) - goto error; + return -1; if (checkBitmap(bitmap, "", -1) < 0) - goto error; + return -1; ignore_value(virBitmapSetBit(bitmap, 0)); if (checkBitmap(bitmap, "0", -1) < 0) - goto error; + return -1; ignore_value(virBitmapSetBit(bitmap, 4)); ignore_value(virBitmapSetBit(bitmap, 5)); if (checkBitmap(bitmap, "0,4-5", -1) < 0) - goto error; + return -1; ignore_value(virBitmapSetBit(bitmap, 6)); if (checkBitmap(bitmap, "0,4-6", -1) < 0) - goto error; + return -1; ignore_value(virBitmapSetBit(bitmap, 13)); ignore_value(virBitmapSetBit(bitmap, 14)); @@ -427,17 +403,15 @@ test6(const void *v G_GNUC_UNUSED) ignore_value(virBitmapSetBit(bitmap, 16)); if (checkBitmap(bitmap, "0,4-6,13-16", -1) < 0) - goto error; + return -1; ignore_value(virBitmapSetBit(bitmap, 62)); ignore_value(virBitmapSetBit(bitmap, 63)); if (checkBitmap(bitmap, "0,4-6,13-16,62-63", -1) < 0) - goto error; + return -1; - ret =3D 0; - error: - return ret; + return 0; } static int @@ -452,28 +426,25 @@ test7(const void *v G_GNUC_UNUSED) for (i =3D 0; i < nmaxBit; i++) { g_autoptr(virBitmap) bitmap =3D 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 @@ -481,24 +452,21 @@ test8(const void *v G_GNUC_UNUSED) { g_autoptr(virBitmap) bitmap =3D NULL; char data[108] =3D {0x00,}; - int ret =3D -1; bitmap =3D 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 =3D 0; - cleanup: - return ret; + return 0; } @@ -506,37 +474,32 @@ test8(const void *v G_GNUC_UNUSED) static int test9(const void *opaque G_GNUC_UNUSED) { - int ret =3D -1; g_autoptr(virBitmap) bitmap =3D NULL; if (virBitmapParse("100000000", &bitmap, 20) !=3D -1) - goto cleanup; + return -1; if (bitmap) - goto cleanup; + return -1; if (virBitmapParse("1-1000000000", &bitmap, 20) !=3D -1) - goto cleanup; + return -1; if (bitmap) - goto cleanup; + return -1; if (virBitmapParse("1-10^10000000000", &bitmap, 20) !=3D -1) - goto cleanup; + return -1; if (bitmap) - goto cleanup; - - ret =3D 0; - cleanup: - return ret; + return -1; + return 0; } static int test10(const void *opaque G_GNUC_UNUSED) { - int ret =3D -1; g_autoptr(virBitmap) b1 =3D NULL; g_autoptr(virBitmap) b2 =3D NULL; g_autoptr(virBitmap) b3 =3D NULL; @@ -546,10 +509,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) || @@ -557,11 +520,9 @@ test10(const void *opaque G_GNUC_UNUSED) virBitmapOverlaps(b2, b4) || !virBitmapOverlaps(b1, b3) || virBitmapOverlaps(b3, b4)) - goto cleanup; + return -1; - ret =3D 0; - cleanup: - return ret; + return 0; } struct testBinaryOpData { @@ -577,12 +538,11 @@ test11(const void *opaque) g_autoptr(virBitmap) amap =3D NULL; g_autoptr(virBitmap) bmap =3D NULL; g_autoptr(virBitmap) resmap =3D NULL; - int ret =3D -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); @@ -590,13 +550,10 @@ test11(const void *opaque) fprintf(stderr, "\n bitmap intersection failed: intersect('%s','%s') !=3D'= %s'\n", data->a, data->b, data->res); - goto cleanup; + return -1; } - ret =3D 0; - - cleanup: - return ret; + return 0; } @@ -605,27 +562,23 @@ static int test12a(const void *opaque G_GNUC_UNUSED) { g_autoptr(virBitmap) map =3D virBitmapNewEmpty(); - int ret =3D -1; if (checkBitmap(map, "", 0) < 0) - goto cleanup; + return -1; if (virBitmapSetBitExpand(map, 128) < 0) - goto cleanup; + return -1; if (checkBitmap(map, "128", 129) < 0) - goto cleanup; + return -1; if (virBitmapClearBitExpand(map, 150) < 0) - goto cleanup; + return -1; if (checkBitmap(map, "128", 151) < 0) - goto cleanup; - - ret =3D 0; + return -1; - cleanup: - return ret; + return 0; } @@ -633,26 +586,22 @@ static int test12b(const void *opaque G_GNUC_UNUSED) { g_autoptr(virBitmap) map =3D NULL; - int ret =3D -1; if (!(map =3D virBitmapParseUnlimited("34,1023"))) - goto cleanup; + return -1; if (checkBitmap(map, "34,1023", 1024) < 0) - goto cleanup; + return -1; virBitmapShrink(map, 35); if (checkBitmap(map, "34", 35) < 0) - goto cleanup; + return -1; virBitmapShrink(map, 34); if (checkBitmap(map, "", 34) < 0) - goto cleanup; - - ret =3D 0; + return -1; - cleanup: - return ret; + return 0; } @@ -691,12 +640,11 @@ test14(const void *opaque) g_autoptr(virBitmap) amap =3D NULL; g_autoptr(virBitmap) bmap =3D NULL; g_autoptr(virBitmap) resmap =3D NULL; - int ret =3D -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); @@ -704,14 +652,10 @@ test14(const void *opaque) fprintf(stderr, "\n bitmap subtraction failed: '%s' - '%s' !=3D '%s'\n", data->a, data->b, data->res); - goto cleanup; + return -1; } - ret =3D 0; - - cleanup: - - return ret; + return 0; } /* virBitmapUnion() */ --=20 2.26.2