From nobody Mon Feb 9 02:27:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1629203213; cv=none; d=zohomail.com; s=zohoarc; b=MNCR7VcH8Ziv/82CQcMQMzcB0GfnYsPUzRZk48EFpyKVAOcaYJ//QThhnYHnzCmtOYmBNHeu12ggiDwenIY0oPNMxTOLBnGfc8RXqO1DBk1IHLj3A1+zEIFsxWQU+clvth1HFJO8Lfqnvlww+kWoNiknaJEQSJ8yFNY1S3nAHX0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629203213; 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=BJERSD9CUFVUCi2r9/l06AmaIjKr6AvI7y4XaMwzZMk=; b=YUmyaBrKSVy7lvh6GFxYHwEkGwN/prAD0oO2hqy6UrRulI6x3/WgJb8aiA1gOX8Q+LHagE0xVBpg2bt1JPTIPP+nALfhgNKyva9w3tRgq24P5QkHcrGJ9ESnM2R1OnzQQnp/M0zD2Nkoe7k5efdTl0KXQMmdRPD4x5IpR9O2A1w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1629203213282327.7261042451995; Tue, 17 Aug 2021 05:26:53 -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-524-4Q2sVEvzMqizrQiirUSyWw-1; Tue, 17 Aug 2021 08:26:49 -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 A1B7A8799EB; Tue, 17 Aug 2021 12:26:44 +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 7CBD96A905; Tue, 17 Aug 2021 12:26:44 +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 43768181A2AA; Tue, 17 Aug 2021 12:26:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17HCPf6m018145 for ; Tue, 17 Aug 2021 08:25:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id 37ACB60871; Tue, 17 Aug 2021 12:25:41 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 90D3360854 for ; Tue, 17 Aug 2021 12:25:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629203212; 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=BJERSD9CUFVUCi2r9/l06AmaIjKr6AvI7y4XaMwzZMk=; b=d1iPwyXJjO1UGigZbiKeBPidFf85k+in158JBrZt5u/MjX2u2+GQvoqxZPTyKsmAc6A6Ah 0LUpazO16zKEbf+qVsx3d4CBMK9pxPkC0f3xdxsM427p2bGs7RAticYX8Y8y1cAHPWeKb1 h/HKUzY2vTwJWDdAe1UHXfMkbmYf/hU= X-MC-Unique: 4Q2sVEvzMqizrQiirUSyWw-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 3/6] Use g_auto for xmlXPathContext everywhere Date: Tue, 17 Aug 2021 14:25:30 +0200 Message-Id: <40ec4ee8aa8141923ee2ef9fe0b3ece936b0822c.1629203014.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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: 1629203214845100001 Signed-off-by: J=C3=A1n Tomko --- src/conf/cpu_conf.c | 3 +-- src/conf/virnetworkportdef.c | 3 +-- src/conf/virnwfilterbindingdef.c | 3 +-- src/conf/virnwfilterbindingobj.c | 3 +-- src/conf/virsavecookie.c | 3 +-- src/conf/virstorageobj.c | 3 +-- src/esx/esx_vi.c | 4 +--- src/libxl/libxl_migration.c | 3 +-- src/qemu/qemu_capabilities.c | 3 +-- src/qemu/qemu_migration_cookie.c | 3 +-- src/security/virt-aa-helper.c | 3 +-- src/storage/storage_util.c | 3 +-- src/test/test_driver.c | 7 ++----- src/vbox/vbox_snapshot_conf.c | 9 +++------ src/vz/vz_driver.c | 3 +-- src/vz/vz_sdk.c | 3 +-- tests/cputest.c | 6 ++---- tests/metadatatest.c | 3 +-- tests/qemucaps2xmltest.c | 4 +--- tests/virnetdevbandwidthtest.c | 3 +-- 20 files changed, 24 insertions(+), 51 deletions(-) diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index 44e62712c5..dac7af4bf4 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -282,7 +282,7 @@ virCPUDefParseXMLString(const char *xml, bool validateXML) { xmlDocPtr doc =3D NULL; - xmlXPathContextPtr ctxt =3D NULL; + g_autoptr(xmlXPathContext) ctxt =3D NULL; int ret =3D -1; =20 if (!xml) { @@ -300,7 +300,6 @@ virCPUDefParseXMLString(const char *xml, =20 cleanup: xmlFreeDoc(doc); - xmlXPathFreeContext(ctxt); return ret; } =20 diff --git a/src/conf/virnetworkportdef.c b/src/conf/virnetworkportdef.c index 9c2a6298d2..8da05353b7 100644 --- a/src/conf/virnetworkportdef.c +++ b/src/conf/virnetworkportdef.c @@ -268,7 +268,7 @@ virNetworkPortDef * virNetworkPortDefParseNode(xmlDocPtr xml, xmlNodePtr root) { - xmlXPathContextPtr ctxt =3D NULL; + g_autoptr(xmlXPathContext) ctxt =3D NULL; virNetworkPortDef *def =3D NULL; =20 if (STRNEQ((const char *)root->name, "networkport")) { @@ -285,7 +285,6 @@ virNetworkPortDefParseNode(xmlDocPtr xml, def =3D virNetworkPortDefParseXML(ctxt); =20 cleanup: - xmlXPathFreeContext(ctxt); return def; } =20 diff --git a/src/conf/virnwfilterbindingdef.c b/src/conf/virnwfilterbinding= def.c index 4079fcdba4..45fa51a56c 100644 --- a/src/conf/virnwfilterbindingdef.c +++ b/src/conf/virnwfilterbindingdef.c @@ -159,7 +159,7 @@ virNWFilterBindingDef * virNWFilterBindingDefParseNode(xmlDocPtr xml, xmlNodePtr root) { - xmlXPathContextPtr ctxt =3D NULL; + g_autoptr(xmlXPathContext) ctxt =3D NULL; virNWFilterBindingDef *def =3D NULL; =20 if (STRNEQ((const char *)root->name, "filterbinding")) { @@ -176,7 +176,6 @@ virNWFilterBindingDefParseNode(xmlDocPtr xml, def =3D virNWFilterBindingDefParseXML(ctxt); =20 cleanup: - xmlXPathFreeContext(ctxt); return def; } =20 diff --git a/src/conf/virnwfilterbindingobj.c b/src/conf/virnwfilterbinding= obj.c index 11426e0a4d..20f33506fd 100644 --- a/src/conf/virnwfilterbindingobj.c +++ b/src/conf/virnwfilterbindingobj.c @@ -236,7 +236,7 @@ static virNWFilterBindingObj * virNWFilterBindingObjParseNode(xmlDocPtr doc, xmlNodePtr root) { - xmlXPathContextPtr ctxt =3D NULL; + g_autoptr(xmlXPathContext) ctxt =3D NULL; virNWFilterBindingObj *obj =3D NULL; =20 if (STRNEQ((const char *)root->name, "filterbindingstatus")) { @@ -253,7 +253,6 @@ virNWFilterBindingObjParseNode(xmlDocPtr doc, obj =3D virNWFilterBindingObjParseXML(doc, ctxt); =20 cleanup: - xmlXPathFreeContext(ctxt); return obj; } =20 diff --git a/src/conf/virsavecookie.c b/src/conf/virsavecookie.c index 0e67bf1477..b7e1e7df93 100644 --- a/src/conf/virsavecookie.c +++ b/src/conf/virsavecookie.c @@ -80,7 +80,7 @@ virSaveCookieParseString(const char *xml, virSaveCookieCallbacks *saveCookie) { xmlDocPtr doc =3D NULL; - xmlXPathContextPtr ctxt =3D NULL; + g_autoptr(xmlXPathContext) ctxt =3D NULL; int ret =3D -1; =20 *obj =3D NULL; @@ -96,7 +96,6 @@ virSaveCookieParseString(const char *xml, ret =3D virSaveCookieParseNode(ctxt, obj, saveCookie); =20 cleanup: - xmlXPathFreeContext(ctxt); xmlFreeDoc(doc); return ret; } diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index 18a7718de9..91c63b2c45 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -1644,7 +1644,7 @@ virStoragePoolObjLoadState(virStoragePoolObjList *poo= ls, char *stateFile =3D NULL; virStoragePoolObj *obj =3D NULL; xmlDocPtr xml =3D NULL; - xmlXPathContextPtr ctxt =3D NULL; + g_autoptr(xmlXPathContext) ctxt =3D NULL; xmlNodePtr node =3D NULL; g_autoptr(virStoragePoolDef) def =3D NULL; =20 @@ -1688,7 +1688,6 @@ virStoragePoolObjLoadState(virStoragePoolObjList *poo= ls, cleanup: VIR_FREE(stateFile); xmlFreeDoc(xml); - xmlXPathFreeContext(ctxt); return obj; } =20 diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index ebc6d9eb69..6f964cc470 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -1224,7 +1224,7 @@ esxVI_Context_Execute(esxVI_Context *ctx, const char = *methodName, g_auto(virBuffer) buffer =3D VIR_BUFFER_INITIALIZER; esxVI_Fault *fault =3D NULL; g_autofree char *xpathExpression =3D NULL; - xmlXPathContextPtr xpathContext =3D NULL; + g_autoptr(xmlXPathContext) xpathContext =3D NULL; xmlNodePtr responseNode =3D NULL; =20 if (!request || !response || *response) { @@ -1385,8 +1385,6 @@ esxVI_Context_Execute(esxVI_Context *ctx, const char = *methodName, esxVI_Fault_Free(&fault); } =20 - xmlXPathFreeContext(xpathContext); - return result; } =20 diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 4677f798fc..817252bce9 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -149,7 +149,7 @@ libxlMigrationEatCookie(const char *cookiein, { libxlMigrationCookie *mig =3D NULL; xmlDocPtr doc =3D NULL; - xmlXPathContextPtr ctxt =3D NULL; + g_autoptr(xmlXPathContext) ctxt =3D NULL; g_autofree char *uuidstr =3D NULL; int ret =3D -1; =20 @@ -216,7 +216,6 @@ libxlMigrationEatCookie(const char *cookiein, libxlMigrationCookieFree(mig); =20 cleanup: - xmlXPathFreeContext(ctxt); xmlFreeDoc(doc); return ret; } diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 9558938866..cecacb051b 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -4196,7 +4196,7 @@ virQEMUCapsLoadCache(virArch hostArch, size_t i; int n; xmlNodePtr *nodes =3D NULL; - xmlXPathContextPtr ctxt =3D NULL; + g_autoptr(xmlXPathContext) ctxt =3D NULL; char *str =3D NULL; long long int l; unsigned long lu; @@ -4421,7 +4421,6 @@ virQEMUCapsLoadCache(virArch hostArch, cleanup: VIR_FREE(str); VIR_FREE(nodes); - xmlXPathFreeContext(ctxt); xmlFreeDoc(doc); return ret; } diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_coo= kie.c index 52998ddd1b..b4081b17e2 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -1432,7 +1432,7 @@ qemuMigrationCookieXMLParseStr(qemuMigrationCookie *m= ig, unsigned int flags) { xmlDocPtr doc =3D NULL; - xmlXPathContextPtr ctxt =3D NULL; + g_autoptr(xmlXPathContext) ctxt =3D NULL; int ret =3D -1; =20 VIR_DEBUG("xml=3D%s", NULLSTR(xml)); @@ -1443,7 +1443,6 @@ qemuMigrationCookieXMLParseStr(qemuMigrationCookie *m= ig, ret =3D qemuMigrationCookieXMLParse(mig, driver, qemuCaps, doc, ctxt, = flags); =20 cleanup: - xmlXPathFreeContext(ctxt); xmlFreeDoc(doc); =20 return ret; diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index e21557c810..2ba2a4a2b8 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -569,7 +569,7 @@ caps_mockup(vahControl * ctl, const char *xmlStr) { int rc =3D -1; xmlDocPtr xml =3D NULL; - xmlXPathContextPtr ctxt =3D NULL; + g_autoptr(xmlXPathContext) ctxt =3D NULL; char *arch; =20 if (!(xml =3D virXMLParseStringCtxt(xmlStr, _("(domain_definition)"), @@ -608,7 +608,6 @@ caps_mockup(vahControl * ctl, const char *xmlStr) =20 cleanup: xmlFreeDoc(xml); - xmlXPathFreeContext(ctxt); =20 return rc; } diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index a7c9355bf9..1beff7726a 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -2893,7 +2893,7 @@ virStorageUtilGlusterExtractPoolSources(const char *h= ost, virStoragePoolType pooltype) { xmlDocPtr doc =3D NULL; - xmlXPathContextPtr ctxt =3D NULL; + g_autoptr(xmlXPathContext) ctxt =3D NULL; virStoragePoolSource *src =3D NULL; size_t i; int nnodes; @@ -2940,7 +2940,6 @@ virStorageUtilGlusterExtractPoolSources(const char *h= ost, ret =3D nnodes; =20 cleanup: - xmlXPathFreeContext(ctxt); xmlFreeDoc(doc); =20 return ret; diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 00cc13511a..6bb52e9302 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1334,7 +1334,7 @@ static int testOpenFromFile(virConnectPtr conn, const char *file) { xmlDocPtr doc =3D NULL; - xmlXPathContextPtr ctxt =3D NULL; + g_autoptr(xmlXPathContext) ctxt =3D NULL; testDriver *privconn; =20 if (!(privconn =3D testDriverNew())) @@ -1355,14 +1355,12 @@ testOpenFromFile(virConnectPtr conn, const char *fi= le) if (testOpenParse(privconn, file, ctxt) < 0) goto error; =20 - xmlXPathFreeContext(ctxt); xmlFreeDoc(doc); virObjectUnlock(privconn); =20 return VIR_DRV_OPEN_SUCCESS; =20 error: - xmlXPathFreeContext(ctxt); xmlFreeDoc(doc); virObjectUnref(privconn); conn->privateData =3D NULL; @@ -1378,7 +1376,7 @@ testOpenDefault(virConnectPtr conn) int ret =3D VIR_DRV_OPEN_ERROR; testDriver *privconn =3D NULL; xmlDocPtr doc =3D NULL; - xmlXPathContextPtr ctxt =3D NULL; + g_autoptr(xmlXPathContext) ctxt =3D NULL; size_t i; =20 virMutexLock(&defaultLock); @@ -1426,7 +1424,6 @@ testOpenDefault(virConnectPtr conn) ret =3D VIR_DRV_OPEN_SUCCESS; cleanup: virMutexUnlock(&defaultLock); - xmlXPathFreeContext(ctxt); xmlFreeDoc(doc); return ret; =20 diff --git a/src/vbox/vbox_snapshot_conf.c b/src/vbox/vbox_snapshot_conf.c index 7fb97d49d9..0f30aef108 100644 --- a/src/vbox/vbox_snapshot_conf.c +++ b/src/vbox/vbox_snapshot_conf.c @@ -578,7 +578,7 @@ virVBoxSnapshotConfLoadVboxFile(const char *filePath, xmlDocPtr xml =3D NULL; xmlNodePtr machineNode =3D NULL; xmlNodePtr cur =3D NULL; - xmlXPathContextPtr xPathContext =3D NULL; + g_autoptr(xmlXPathContext) xPathContext =3D NULL; char *currentStateModifiedString =3D NULL; =20 char **searchResultTab =3D NULL; @@ -716,7 +716,6 @@ virVBoxSnapshotConfLoadVboxFile(const char *filePath, ret =3D 0; =20 cleanup: - xmlXPathFreeContext(xPathContext); xmlFreeDoc(xml); =20 VIR_FREE(currentStateModifiedString); @@ -1221,7 +1220,7 @@ virVBoxSnapshotConfGetRWDisksPathsFromLibvirtXML(cons= t char *filePath, size_t i =3D 0; char **ret =3D NULL; xmlDocPtr xml =3D NULL; - xmlXPathContextPtr xPathContext =3D NULL; + g_autoptr(xmlXPathContext) xPathContext =3D NULL; xmlNodePtr *nodes =3D NULL; int nodeSize =3D 0; *rwDisksPath =3D NULL; @@ -1260,7 +1259,6 @@ virVBoxSnapshotConfGetRWDisksPathsFromLibvirtXML(cons= t char *filePath, =20 cleanup: xmlFreeDoc(xml); - xmlXPathFreeContext(xPathContext); if (result < 0) { g_strfreev(ret); nodeSize =3D -1; @@ -1284,7 +1282,7 @@ virVBoxSnapshotConfGetRODisksPathsFromLibvirtXML(cons= t char *filePath, size_t i =3D 0; char **ret =3D NULL; xmlDocPtr xml =3D NULL; - xmlXPathContextPtr xPathContext =3D NULL; + g_autoptr(xmlXPathContext) xPathContext =3D NULL; xmlNodePtr *nodes =3D NULL; int nodeSize =3D 0; if (filePath =3D=3D NULL) { @@ -1322,7 +1320,6 @@ virVBoxSnapshotConfGetRODisksPathsFromLibvirtXML(cons= t char *filePath, =20 cleanup: xmlFreeDoc(xml); - xmlXPathFreeContext(xPathContext); if (result < 0) { g_strfreev(ret); nodeSize =3D -1; diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index a9cd3d90c9..edc4327550 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -2790,7 +2790,7 @@ static vzMigrationCookie * vzEatCookie(const char *cookiein, int cookieinlen, unsigned int flags) { xmlDocPtr doc =3D NULL; - xmlXPathContextPtr ctx =3D NULL; + g_autoptr(xmlXPathContext) ctx =3D NULL; vzMigrationCookie *mig =3D NULL; =20 mig =3D g_new0(vzMigrationCookie, 1); @@ -2838,7 +2838,6 @@ vzEatCookie(const char *cookiein, int cookieinlen, un= signed int flags) } =20 cleanup: - xmlXPathFreeContext(ctx); xmlFreeDoc(doc); return mig; =20 diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 7871b04005..5a747913b5 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -4579,7 +4579,7 @@ prlsdkParseSnapshotTree(const char *treexml) { virDomainSnapshotObjList *ret =3D NULL; xmlDocPtr xml =3D NULL; - xmlXPathContextPtr ctxt =3D NULL; + g_autoptr(xmlXPathContext) ctxt =3D NULL; xmlNodePtr root; xmlNodePtr *nodes =3D NULL; virDomainSnapshotDef *def =3D NULL; @@ -4696,7 +4696,6 @@ prlsdkParseSnapshotTree(const char *treexml) virDomainSnapshotObjListFree(snapshots); VIR_FREE(nodes); VIR_FREE(xmlstr); - xmlXPathFreeContext(ctxt); xmlFreeDoc(xml); VIR_FREE(def); =20 diff --git a/tests/cputest.c b/tests/cputest.c index 18de84e050..34d9e8ddb0 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -72,7 +72,7 @@ cpuTestLoadXML(virArch arch, const char *name) { char *xml =3D NULL; xmlDocPtr doc =3D NULL; - xmlXPathContextPtr ctxt =3D NULL; + g_autoptr(xmlXPathContext) ctxt =3D NULL; virCPUDef *cpu =3D NULL; =20 xml =3D g_strdup_printf("%s/cputestdata/%s-%s.xml", abs_srcdir, @@ -84,7 +84,6 @@ cpuTestLoadXML(virArch arch, const char *name) virCPUDefParseXML(ctxt, NULL, VIR_CPU_TYPE_AUTO, &cpu, false); =20 cleanup: - xmlXPathFreeContext(ctxt); xmlFreeDoc(doc); VIR_FREE(xml); return cpu; @@ -98,7 +97,7 @@ cpuTestLoadMultiXML(virArch arch, { char *xml =3D NULL; xmlDocPtr doc =3D NULL; - xmlXPathContextPtr ctxt =3D NULL; + g_autoptr(xmlXPathContext) ctxt =3D NULL; xmlNodePtr *nodes =3D NULL; virCPUDef **cpus =3D NULL; int n; @@ -130,7 +129,6 @@ cpuTestLoadMultiXML(virArch arch, cleanup: VIR_FREE(xml); VIR_FREE(nodes); - xmlXPathFreeContext(ctxt); xmlFreeDoc(doc); return cpus; =20 diff --git a/tests/metadatatest.c b/tests/metadatatest.c index a9080b32d7..ceb683028c 100644 --- a/tests/metadatatest.c +++ b/tests/metadatatest.c @@ -57,7 +57,7 @@ static char * getMetadataFromXML(virDomainPtr dom) { xmlDocPtr doc =3D NULL; - xmlXPathContextPtr ctxt =3D NULL; + g_autoptr(xmlXPathContext) ctxt =3D NULL; xmlNodePtr node; =20 char *xml =3D NULL; @@ -77,7 +77,6 @@ getMetadataFromXML(virDomainPtr dom) cleanup: VIR_FREE(xml); xmlFreeDoc(doc); - xmlXPathFreeContext(ctxt); =20 return ret; } diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c index 68bbf07ec2..35eb27c1fb 100644 --- a/tests/qemucaps2xmltest.c +++ b/tests/qemucaps2xmltest.c @@ -52,7 +52,7 @@ testQemuGetCaps(char *caps) { virQEMUCaps *qemuCaps =3D NULL; xmlDocPtr xml; - xmlXPathContextPtr ctxt =3D NULL; + g_autoptr(xmlXPathContext) ctxt =3D NULL; ssize_t i, n; g_autofree xmlNodePtr *nodes =3D NULL; =20 @@ -80,13 +80,11 @@ testQemuGetCaps(char *caps) } =20 xmlFreeDoc(xml); - xmlXPathFreeContext(ctxt); return qemuCaps; =20 error: virObjectUnref(qemuCaps); xmlFreeDoc(xml); - xmlXPathFreeContext(ctxt); return NULL; } =20 diff --git a/tests/virnetdevbandwidthtest.c b/tests/virnetdevbandwidthtest.c index f399c95da0..51ceae5a6a 100644 --- a/tests/virnetdevbandwidthtest.c +++ b/tests/virnetdevbandwidthtest.c @@ -43,7 +43,7 @@ struct testSetStruct { do { \ int rc; \ xmlDocPtr doc; \ - xmlXPathContextPtr ctxt =3D NULL; \ + g_autoptr(xmlXPathContext) ctxt =3D NULL; \ \ if (!xml) \ break; \ @@ -58,7 +58,6 @@ struct testSetStruct { ctxt->node, \ true); \ xmlFreeDoc(doc); \ - xmlXPathFreeContext(ctxt); \ if (rc < 0) \ goto cleanup; \ } while (0) --=20 2.31.1