From nobody Mon Feb 9 20:11:33 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1636373948; cv=none; d=zohomail.com; s=zohoarc; b=TrDwaJbBvYQqR6Bjg17MqU+XYiPKE6oe5S8F8Nk6AH1MXOucfelhKQH5od2+HtGf6OaZKbWWFgu2FuXaIryPHkhxpAv4+hNZg45gv12Hwyx/e33DPXvF5OgiLyX0x7L4Wyd8YquF2UkIh1ub0F+CjLjug8SdAVtxqfm6E8JuLgI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636373948; h=Content-Type:Content-Transfer-Encoding:Cc: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=TQR3Bz7XKNqnLtVQq9yRS7txHHW4580+G8CQqS5Ts7Q=; b=WL6laKBgWuHtAG7KqsrwBZyw1lRq8foM05XrcpEGxghGiX4fb3LXxG8wg14ywnnpkPl+nSaWtV/C37H0lKwe7wrbzPBvB+DNRyTNIDzEUZw9jYCE6shJowGcbqdieqkCNhAYBQj261I29Cmszn0Ttk0ujm3OFZjIReH09vx1Jps= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1636373948350782.4990033191161; Mon, 8 Nov 2021 04:19:08 -0800 (PST) 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-401-uXhJ4_ToOa-5S91XjNhCaQ-1; Mon, 08 Nov 2021 07:19:03 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 03713A40C3; Mon, 8 Nov 2021 12:18:56 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D3F4C5F4F4; Mon, 8 Nov 2021 12:18:55 +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 A707A1832DDE; Mon, 8 Nov 2021 12:18:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1A8CIsvM011909 for ; Mon, 8 Nov 2021 07:18:54 -0500 Received: by smtp.corp.redhat.com (Postfix) id 1D3105DA61; Mon, 8 Nov 2021 12:18:54 +0000 (UTC) Received: from work.redhat.com (unknown [10.39.193.223]) by smtp.corp.redhat.com (Postfix) with ESMTP id 62B0E5DF5E; Mon, 8 Nov 2021 12:18:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636373947; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=TQR3Bz7XKNqnLtVQq9yRS7txHHW4580+G8CQqS5Ts7Q=; b=i911Jzdwr5Hc7BraPjZqbmqH82zpWWgTmQUtCiSVFJGH9Ep76ZIkei0ZfXTeagm3UdmHrj LFLe/A5URvVAO1sLZChPW1pFCg/fdXoAnk5lPpzindSO++BXFep9awx+Fs83wC1Avaw1cH CbjWRvxJIEGiCINTvd1awat6Dxoeq8Y= X-MC-Unique: uXhJ4_ToOa-5S91XjNhCaQ-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 10/10] testVshTableHeader: Cleanup Date: Mon, 8 Nov 2021 13:17:40 +0100 Message-Id: <20211108121740.98621-11-twiederh@redhat.com> In-Reply-To: <20211108121740.98621-1-twiederh@redhat.com> References: <20211108121740.98621-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake 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.15 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) X-ZM-MESSAGEID: 1636373949116100002 Content-Type: text/plain; charset="utf-8" Remove unnecessary label and goto. This also fixes a bug where a failure to create the table would result in the test passing. Signed-off-by: Tim Wiederhake --- tests/vshtabletest.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/tests/vshtabletest.c b/tests/vshtabletest.c index 716b11dbc0..41ceec0a51 100644 --- a/tests/vshtabletest.c +++ b/tests/vshtabletest.c @@ -45,7 +45,8 @@ static int testVshTableHeader(const void *opaque G_GNUC_UNUSED) { int ret =3D 0; - char *act =3D NULL; + g_autofree char *act =3D NULL; + g_autofree char *act2 =3D NULL; const char *exp =3D " 1 fedora28 running\n" " 2 rhel7.5 running\n"; @@ -58,7 +59,7 @@ testVshTableHeader(const void *opaque G_GNUC_UNUSED) g_autoptr(vshTable) table =3D vshTableNew("Id", "Name", "State", NULL); //to ask about return if (!table) - goto cleanup; + return -1; =20 vshTableRowAppend(table, "1", "fedora28", "running", NULL); vshTableRowAppend(table, "2", "rhel7.5", "running", @@ -68,13 +69,10 @@ testVshTableHeader(const void *opaque G_GNUC_UNUSED) if (virTestCompareToString(exp, act) < 0) ret =3D -1; =20 - VIR_FREE(act); - act =3D vshTablePrintToString(table, true); - if (virTestCompareToString(exp2, act) < 0) + act2 =3D vshTablePrintToString(table, true); + if (virTestCompareToString(exp2, act2) < 0) ret =3D -1; =20 - cleanup: - VIR_FREE(act); return ret; } =20 --=20 2.31.1