From nobody Mon Feb 9 09:08: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=1601624629; cv=none; d=zohomail.com; s=zohoarc; b=LwYR9k0XtRcEGNS6ZkXHPzCmF2s9w+WQmGroBdyxUkVSkzoVfOwvyJWZkvrd51ky4fGTgou6a0YoqUMV4HWBV/yFJ/kCtt31FvBzXwnmkxOElO3jTgqVoZEA5dethVkWtxqIc+5a5HhYtlQLFkMcY1fygZWwWDf+m/2vCRK3oRI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601624629; 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=szv4glwUfHBXZl6FhBS+Ch6qPH8kS0h+OBwgJ/dMxD0=; b=BY9YsiOdq+WLLtFMQ9UwsYKto/lE1NGOs2EvWEGcbhZ/93UdFCsxM8hN9Ydkc8gdc9GNMNgFchAu//jFv8/QAEQqCYD4thAtFcfkLkdzt6/7rxVgvlaErR3Ql44Uc2fXP4PAT/1Fsa9wfJo+yO5lUiQh3AAe8vZ82NR8U2EGB9I= 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 1601624629306322.74986089359265; Fri, 2 Oct 2020 00:43:49 -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-588-HXrBcLEJMHipYuEd50XtRA-1; Fri, 02 Oct 2020 03:43:45 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3736D801AFB; Fri, 2 Oct 2020 07:43:40 +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 177D05D9E4; Fri, 2 Oct 2020 07:43:40 +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 D6D4044A67; Fri, 2 Oct 2020 07:43:39 +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 0927hK3j004136 for ; Fri, 2 Oct 2020 03:43:20 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8047119931; Fri, 2 Oct 2020 07:43:20 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id D19F11992F for ; Fri, 2 Oct 2020 07:43:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601624627; 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=szv4glwUfHBXZl6FhBS+Ch6qPH8kS0h+OBwgJ/dMxD0=; b=YCbXfOL93bwjF4kCBiCTNxe5RclfI70h5zO3lVKUVDposxa7h/xDYmnsTBCmNLQnhP2S6a sMBcu6/i2Bke2apS/yUn4TScxcA2u+YfOjE38G8gIf6oP0J45+ShVALOSlY3oq+WLLIxsA okTlZLT7It0lu87XX5St1zTrBm99U24= X-MC-Unique: HXrBcLEJMHipYuEd50XtRA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 05/15] virbitmaptest: test13: Refactor memory cleanup Date: Fri, 2 Oct 2020 09:42:59 +0200 Message-Id: <6e288d0c45dc98388ed7a158094f604a0ff9d653.1601624533.git.pkrempa@redhat.com> 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.14 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" Move scope of variables and get rid of the 'cleanup' section. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- 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 =3D NULL; const char *strings[] =3D { "1234feebee", "000c0fefe" }; - char *str =3D NULL; size_t i =3D 0; - int ret =3D -1; for (i =3D 0; i < G_N_ELEMENTS(strings); i++) { - map =3D virBitmapNewString(strings[i]); - if (!map) - goto cleanup; + g_autoptr(virBitmap) map =3D NULL; + g_autofree char *str =3D NULL; - str =3D virBitmapToString(map); - if (!str) - goto cleanup; + if (!(map =3D virBitmapNewString(strings[i]))) + return -1; + + if (!(str =3D 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; } - - VIR_FREE(str); - virBitmapFree(map); - map =3D NULL; } - ret =3D 0; - cleanup: - VIR_FREE(str); - virBitmapFree(map); - return ret; + return 0; } #undef TEST_MAP --=20 2.26.2