From nobody Mon Feb 9 03:31:04 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=1630788688; cv=none; d=zohomail.com; s=zohoarc; b=Oa4NCBSyzfaqD5qQS8Eo8IpUqNwfD0/l/lru+ZJ9p8ngBElQQEFsPFzX1Cz7K6IriVu9rc5P0IYxsr8yLGhClCYF4Cm6W2fRNF4Geu7jzBhOxxW+p70ohhu2nK8gu8ISrQuTOhKxZHBYfveKPNbuI08sEJOKOeWdOxb5PJKRcG4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1630788688; 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=pHOPvJXm+pre440yZq03ilTLkm7LXzfbVy9aAOexNxs=; b=hkopXZ8O07JLVH+WJ0F9zub9191EK5mR3rCR7mfKizNUvk4keBnld7uGbx6inU5UjWikDgfHrtsfwxyCjPeWNBxlm54I6TfnzBpuTqgzavstBKJUqmqSs5b62x9pC+Tk4a7rdCjft23l8VR6KM2DAerATU63dBu/UB6vhpc4bsY= 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 1630788688754248.92805406207947; Sat, 4 Sep 2021 13:51:28 -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-265-iukCmubWMniYYqd5dbW_PA-1; Sat, 04 Sep 2021 16:51:25 -0400 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 14BDE51E0; Sat, 4 Sep 2021 20:51:21 +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 EF3403AB2; Sat, 4 Sep 2021 20:51:20 +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 B74F244A5B; Sat, 4 Sep 2021 20:51:20 +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 184KiWoS008759 for ; Sat, 4 Sep 2021 16:44:32 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9E8DD2619D; Sat, 4 Sep 2021 20:44:32 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2775A1F4 for ; Sat, 4 Sep 2021 20:44:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630788687; 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=pHOPvJXm+pre440yZq03ilTLkm7LXzfbVy9aAOexNxs=; b=XwYoc4Q6y0/jOeikIeVYfBK2/qYKxIda8EB+5N3Od7tvXvHEVL8yHdmx61Di5o+jjNWmYX uFAYLHLo3xmVhfGG3h9sqM30Joi6dnvAN5zZHYrmtWyiB/fbHzJSzVcVgvSufIK46BJN+k 0DIUrR6WqOjOhIIIk/KqNhowZlreaVU= X-MC-Unique: iukCmubWMniYYqd5dbW_PA-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 06/24] tests: network: use g_autofree Date: Sat, 4 Sep 2021 22:44:04 +0200 Message-Id: <75ba62743765afb2166afac0d352cbea26aabad6.1630788206.git.jtomko@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.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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1630788689011100003 Signed-off-by: J=C3=A1n Tomko --- tests/networkxml2conftest.c | 16 +++++----------- tests/networkxml2firewalltest.c | 9 +++------ tests/networkxml2xmltest.c | 10 +++------- tests/networkxml2xmlupdatetest.c | 16 +++++----------- 4 files changed, 16 insertions(+), 35 deletions(-) diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c index a2ecc6e80a..b76d72793a 100644 --- a/tests/networkxml2conftest.c +++ b/tests/networkxml2conftest.c @@ -20,12 +20,12 @@ testCompareXMLToConfFiles(const char *inxml, const char= *outconf, char *outhostsfile, dnsmasqCaps *caps) { char *confactual =3D NULL; - char *hostsfileactual =3D NULL; + g_autofree char *hostsfileactual =3D NULL; int ret =3D -1; virNetworkDef *def =3D NULL; virNetworkObj *obj =3D NULL; virCommand *cmd =3D NULL; - char *pidfile =3D NULL; + g_autofree char *pidfile =3D NULL; dnsmasqContext *dctx =3D NULL; g_autoptr(virNetworkXMLOption) xmlopt =3D NULL; =20 @@ -82,8 +82,6 @@ testCompareXMLToConfFiles(const char *inxml, const char *= outconf, =20 fail: VIR_FREE(confactual); - VIR_FREE(hostsfileactual); - VIR_FREE(pidfile); virCommandFree(cmd); virNetworkObjEndAPI(&obj); dnsmasqContextFree(dctx); @@ -100,9 +98,9 @@ testCompareXMLToConfHelper(const void *data) { int result =3D -1; const testInfo *info =3D data; - char *inxml =3D NULL; - char *outconf =3D NULL; - char *outhostsfile =3D NULL; + g_autofree char *inxml =3D NULL; + g_autofree char *outconf =3D NULL; + g_autofree char *outhostsfile =3D NULL; =20 inxml =3D g_strdup_printf("%s/networkxml2confdata/%s.xml", abs_srcdir,= info->name); outconf =3D g_strdup_printf("%s/networkxml2confdata/%s.conf", abs_srcd= ir, info->name); @@ -110,10 +108,6 @@ testCompareXMLToConfHelper(const void *data) =20 result =3D testCompareXMLToConfFiles(inxml, outconf, outhostsfile, inf= o->caps); =20 - VIR_FREE(inxml); - VIR_FREE(outconf); - VIR_FREE(outhostsfile); - return result; } =20 diff --git a/tests/networkxml2firewalltest.c b/tests/networkxml2firewalltes= t.c index 91336a0c55..e4f86bc3fc 100644 --- a/tests/networkxml2firewalltest.c +++ b/tests/networkxml2firewalltest.c @@ -91,7 +91,7 @@ static int testCompareXMLToArgvFiles(const char *xml, const char *cmdline, const char *baseargs) { - char *actualargv =3D NULL; + g_autofree char *actualargv =3D NULL; g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; virNetworkDef *def =3D NULL; int ret =3D -1; @@ -121,7 +121,6 @@ static int testCompareXMLToArgvFiles(const char *xml, ret =3D 0; =20 cleanup: - VIR_FREE(actualargv); virNetworkDefFree(def); return ret; } @@ -137,8 +136,8 @@ testCompareXMLToIPTablesHelper(const void *data) { int result =3D -1; const struct testInfo *info =3D data; - char *xml =3D NULL; - char *args =3D NULL; + g_autofree char *xml =3D NULL; + g_autofree char *args =3D NULL; =20 xml =3D g_strdup_printf("%s/networkxml2firewalldata/%s.xml", abs_srcdir, info->name); @@ -147,8 +146,6 @@ testCompareXMLToIPTablesHelper(const void *data) =20 result =3D testCompareXMLToArgvFiles(xml, args, info->baseargs); =20 - VIR_FREE(xml); - VIR_FREE(args); return result; } =20 diff --git a/tests/networkxml2xmltest.c b/tests/networkxml2xmltest.c index e1b5cdc748..ca24305ace 100644 --- a/tests/networkxml2xmltest.c +++ b/tests/networkxml2xmltest.c @@ -26,7 +26,7 @@ testCompareXMLToXMLFiles(const char *inxml, const char *o= utxml, unsigned int flags, testCompareNetXML2XMLResult expectResult) { - char *actual =3D NULL; + g_autofree char *actual =3D NULL; int ret; testCompareNetXML2XMLResult result =3D TEST_COMPARE_NET_XML2XML_RESULT= _SUCCESS; virNetworkDef *dev =3D NULL; @@ -70,7 +70,6 @@ testCompareXMLToXMLFiles(const char *inxml, const char *o= utxml, } virResetLastError(); =20 - VIR_FREE(actual); virNetworkDefFree(dev); return ret; } @@ -86,8 +85,8 @@ testCompareXMLToXMLHelper(const void *data) { const struct testInfo *info =3D data; int result =3D -1; - char *inxml =3D NULL; - char *outxml =3D NULL; + g_autofree char *inxml =3D NULL; + g_autofree char *outxml =3D NULL; =20 inxml =3D g_strdup_printf("%s/networkxml2xmlin/%s.xml", abs_srcdir, in= fo->name); outxml =3D g_strdup_printf("%s/networkxml2xmlout/%s.xml", abs_srcdir, = info->name); @@ -95,9 +94,6 @@ testCompareXMLToXMLHelper(const void *data) result =3D testCompareXMLToXMLFiles(inxml, outxml, info->flags, info->expectResult); =20 - VIR_FREE(inxml); - VIR_FREE(outxml); - return result; } =20 diff --git a/tests/networkxml2xmlupdatetest.c b/tests/networkxml2xmlupdatet= est.c index 11cfdfc25e..4471b4dd9e 100644 --- a/tests/networkxml2xmlupdatetest.c +++ b/tests/networkxml2xmlupdatetest.c @@ -19,8 +19,8 @@ testCompareXMLToXMLFiles(const char *netxml, const char *= updatexml, unsigned int command, unsigned int section, int parentIndex, bool expectFailure) { - char *updateXmlData =3D NULL; - char *actual =3D NULL; + g_autofree char *updateXmlData =3D NULL; + g_autofree char *actual =3D NULL; int ret =3D -1; virNetworkDef *def =3D NULL; =20 @@ -55,8 +55,6 @@ testCompareXMLToXMLFiles(const char *netxml, const char *= updatexml, } } error: - VIR_FREE(updateXmlData); - VIR_FREE(actual); virNetworkDefFree(def); return ret; } @@ -78,9 +76,9 @@ testCompareXMLToXMLHelper(const void *data) { const struct testInfo *info =3D data; int result =3D -1; - char *netxml =3D NULL; - char *updatexml =3D NULL; - char *outxml =3D NULL; + g_autofree char *netxml =3D NULL; + g_autofree char *updatexml =3D NULL; + g_autofree char *outxml =3D NULL; =20 netxml =3D g_strdup_printf("%s/networkxml2xmlin/%s.xml", abs_srcdir, info->netxml); @@ -93,10 +91,6 @@ testCompareXMLToXMLHelper(const void *data) info->command, info->section, info->parentIndex, info->expectFailu= re); =20 - VIR_FREE(netxml); - VIR_FREE(updatexml); - VIR_FREE(outxml); - return result; } =20 --=20 2.31.1