From nobody Sat Apr 27 06:25:57 2024 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=1629203176; cv=none; d=zohomail.com; s=zohoarc; b=Qauj6BC5mbYGXGnCAeWaYD0UtEXsEgTzvRZ1hDD/FREGwm8x67OGwhyvHQAGto0SpKoNl9GZ0NttSObtM8XDL5UpQQdd/D5JzqXf4y7KjUIk+X3tI7k+c35lcNIfNYLHIXghJHp6Ob/mnv8ux9SEacIT47zZkGgo9FewiXnnIzo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629203176; 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=BsXzc6xauJpyOrhgbTvk8wZ1cHlCPkaFddjUGGVn4qA=; b=HfReK2ghByd9tCXs8uT1mytbrkLSJC7WksThBSKXQExZtxze2aNnoN9LUIB85q2MhsNxLc9oudVAe5b4G+uI4xzU60EViSPYWM+bh9oLIkY7wQ1M91KCRPT0Ltv0yDF0MssN4v4ii2jh20dD/4H7B6xjIoLIDnv+ROcPC8Trm+w= 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 1629203176004297.46471621358967; Tue, 17 Aug 2021 05:26:16 -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-537-nXr4COHlM_ediQpaa2VS6g-1; Tue, 17 Aug 2021 08:26:13 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 01182190B2A7; Tue, 17 Aug 2021 12:26:08 +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 D7D2760871; Tue, 17 Aug 2021 12:26:07 +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 9D1E44BB7C; Tue, 17 Aug 2021 12:26:07 +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 17HCPd08018125 for ; Tue, 17 Aug 2021 08:25:39 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7558260871; Tue, 17 Aug 2021 12:25:39 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id F3E1460854 for ; Tue, 17 Aug 2021 12:25:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629203174; 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=BsXzc6xauJpyOrhgbTvk8wZ1cHlCPkaFddjUGGVn4qA=; b=fsPxjA6AwQQJaWcZQcJKK+Gg7sasjryxo6B/pamDqlNnWetxniQZDw8g67PBtqmt/HQm0p +2TCHcfrLej4Z93vvp0+mfF8ZhNMsaoC/CnMefRHhGGpHh6YT7+Xb6JvBmwWZsQ7JAxmhn asLVqi8Y9WM1LCCHj8YZk5G5kVi/Ncc= X-MC-Unique: nXr4COHlM_ediQpaa2VS6g-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 1/6] conf: virCPUDefListParse: reduce scope of variables Date: Tue, 17 Aug 2021 14:25:28 +0200 Message-Id: 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.13 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: 1629203176932100001 Move 'ctxt' and 'doc' inside the loop and mark them with g_auto. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Pavel Hrdina --- src/conf/cpu_conf.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index 58d04df1b8..44e62712c5 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -1126,8 +1126,6 @@ virCPUDefListParse(const char **xmlCPUs, unsigned int ncpus, virCPUType cpuType) { - xmlDocPtr doc =3D NULL; - xmlXPathContextPtr ctxt =3D NULL; virCPUDef **cpus =3D NULL; size_t i; =20 @@ -1152,24 +1150,20 @@ virCPUDefListParse(const char **xmlCPUs, cpus =3D g_new0(virCPUDef *, ncpus + 1); =20 for (i =3D 0; i < ncpus; i++) { + g_autoptr(xmlDoc) doc =3D NULL; + g_autoptr(xmlXPathContext) ctxt =3D NULL; + if (!(doc =3D virXMLParseStringCtxt(xmlCPUs[i], _("(CPU_definition= )"), &ctxt))) goto error; =20 if (virCPUDefParseXML(ctxt, NULL, cpuType, &cpus[i], false) < 0) goto error; - - xmlXPathFreeContext(ctxt); - xmlFreeDoc(doc); - ctxt =3D NULL; - doc =3D NULL; } =20 return cpus; =20 error: virCPUDefListFree(cpus); - xmlXPathFreeContext(ctxt); - xmlFreeDoc(doc); return NULL; } =20 --=20 2.31.1 From nobody Sat Apr 27 06:25:57 2024 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=1629203179; cv=none; d=zohomail.com; s=zohoarc; b=XLOfB1NqSvQRJi7SAczeYePY0RkRuVUMmJUYntMwYM3G5EQIuezGMTRspDj/1p1vhgRZdtOzjVBAIW/aAY5A2jZAtkU/Cms/3iDKsEyGBk4Y+xynz6uTiThAcpIqTGUeOZT3JENIMdO7gEohcoSHsKT7Ii1ToHwBt4++tmF32As= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629203179; 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=XmF22A4GMWR2agQCZOo3B3Ov92pabJiyorH9L9OW+q4=; b=KECGDNfTNmYrJNj/bvdLKfPY8Xia8/dScY7rC1fP3ktJFZyQA7IEWLLP2Xhos60nC/yAUSxl4o0C6cl3Hm0gXeUL8jZoi/dJAI7RzMte3E7UHcgqwErCKZVp4EaoLhawaldTGJI+NQLdMCHo1Y3sYq7n9zsWxI9/yrShjcjouvg= 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 1629203179951709.6802545917034; Tue, 17 Aug 2021 05:26:19 -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-549-YzfR-BLoNauCkjhJCt-jUw-1; Tue, 17 Aug 2021 08:26:16 -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 CF220802922; Tue, 17 Aug 2021 12:26:10 +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 AC7E51909D; Tue, 17 Aug 2021 12:26:10 +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 74FFD181A1F3; Tue, 17 Aug 2021 12:26:10 +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 17HCPePt018135 for ; Tue, 17 Aug 2021 08:25:40 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4488C60871; Tue, 17 Aug 2021 12:25:40 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id C223A60854 for ; Tue, 17 Aug 2021 12:25:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629203178; 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=XmF22A4GMWR2agQCZOo3B3Ov92pabJiyorH9L9OW+q4=; b=ardkTnsBTGJmAOAEA0Cj6zWM8xDfdQsrQn5nfB0bsgU5KGlK3Bl4XpWaw8Wy4DERgXt/Yl idmUoYPdfwxOfltvaccx5YmH0ukAVDbRWwfoqvt4veEcQpyg9kla+//w6Z0KywS0Bm6Srx 6tSxkp5PzHYEvmbrfQp+QY2ZpPJYHdI= X-MC-Unique: YzfR-BLoNauCkjhJCt-jUw-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 2/6] conf: refactor virNetworkLoadState Date: Tue, 17 Aug 2021 14:25:29 +0200 Message-Id: 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.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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1629203181530100001 Use g_auto where possible, reducing variable scope where applicable. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Pavel Hrdina --- src/conf/virnetworkobj.c | 37 ++++++++++++------------------------- 1 file changed, 12 insertions(+), 25 deletions(-) diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index 2a2d94dc98..aa629af6f6 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -860,13 +860,13 @@ virNetworkLoadState(virNetworkObjList *nets, const char *name, virNetworkXMLOption *xmlopt) { - char *configFile =3D NULL; + g_autofree char *configFile =3D NULL; virNetworkDef *def =3D NULL; virNetworkObj *obj =3D NULL; - xmlDocPtr xml =3D NULL; - xmlNodePtr node =3D NULL, *nodes =3D NULL; - xmlXPathContextPtr ctxt =3D NULL; - virBitmap *classIdMap =3D NULL; + g_autoptr(xmlDoc) xml =3D NULL; + xmlNodePtr node =3D NULL; + g_autoptr(xmlXPathContext) ctxt =3D NULL; + g_autoptr(virBitmap) classIdMap =3D NULL; unsigned long long floor_sum_val =3D 0; unsigned int taint =3D 0; int n; @@ -903,18 +903,16 @@ virNetworkLoadState(virNetworkObjList *nets, if (virXMLNodeNameEqual(node, "networkstatus")) { /* Newer network status file. Contains useful * info which are not to be found in bare config XML */ - char *classIdStr =3D NULL; - char *floor_sum =3D NULL; + g_autofree char *classIdStr =3D NULL; + g_autofree char *floor_sum =3D NULL; + g_autofree xmlNodePtr *nodes =3D NULL; =20 ctxt->node =3D node; if ((classIdStr =3D virXPathString("string(./class_id[1]/@bitmap)", ctxt))) { - if (!(classIdMap =3D virBitmapParseUnlimited(classIdStr))) { - VIR_FREE(classIdStr); + if (!(classIdMap =3D virBitmapParseUnlimited(classIdStr))) goto error; - } } - VIR_FREE(classIdStr); =20 floor_sum =3D virXPathString("string(./floor[1]/@sum)", ctxt); if (floor_sum && @@ -922,31 +920,26 @@ virNetworkLoadState(virNetworkObjList *nets, virReportError(VIR_ERR_INTERNAL_ERROR, _("Malformed 'floor_sum' attribute: %s"), floor_sum); - VIR_FREE(floor_sum); goto error; } - VIR_FREE(floor_sum); =20 if ((n =3D virXPathNodeSet("./taint", ctxt, &nodes)) < 0) goto error; =20 for (i =3D 0; i < n; i++) { - char *str =3D virXMLPropString(nodes[i], "flag"); + g_autofree char *str =3D virXMLPropString(nodes[i], "flag"); if (str) { int flag =3D virNetworkTaintTypeFromString(str); if (flag < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unknown taint flag %s"), str); - VIR_FREE(str); goto error; } - VIR_FREE(str); /* Compute taint mask here. The network object does not * exist yet, so we can't use virNetworkObjtTaint. */ taint |=3D (1 << flag); } } - VIR_FREE(nodes); } =20 /* create the object */ @@ -958,7 +951,7 @@ virNetworkLoadState(virNetworkObjList *nets, /* assign status data stored in the network object */ if (classIdMap) { virBitmapFree(obj->classIdMap); - obj->classIdMap =3D classIdMap; + obj->classIdMap =3D g_steal_pointer(&classIdMap); } =20 if (floor_sum_val > 0) @@ -967,17 +960,11 @@ virNetworkLoadState(virNetworkObjList *nets, obj->taint =3D taint; obj->active =3D true; /* network with a state file is by definition ac= tive */ =20 - cleanup: - VIR_FREE(configFile); - xmlFreeDoc(xml); - xmlXPathFreeContext(ctxt); return obj; =20 error: - VIR_FREE(nodes); - virBitmapFree(classIdMap); virNetworkDefFree(def); - goto cleanup; + return NULL; } =20 =20 --=20 2.31.1 From nobody Sat Apr 27 06:25:57 2024 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 Reviewed-by: Pavel Hrdina --- 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 From nobody Sat Apr 27 06:25:57 2024 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=1629203216; cv=none; d=zohomail.com; s=zohoarc; b=L1nK3mt3R06WUz+nBvtmerCG5OOOyQKDrkBCB9MIxZffrnJZP1kde2bzbb8PYRmU962KL3HGi1+8cwWzBH3xeH7nkag9lag+sMWQWfaaoTAHWnxf9TwDQ7O+WQXWKN0H5U31z7T7Vnd+WhRwnU4Zc/a5vhDjOBcv53qGOfYQ8f4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629203216; 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=s8YE6JdscYiCP8xyKM/GEkOqvSzOJeTL+rRLPMRRo08=; b=fxfaTMOu7IUswpxcxfNDcXfDXWlTU7e6G4aLoWxACwzkd8DX3VxHkQjMUeLSf/42oHZgzLeW3P7w/uPZZgsWl5pRTJIG+MwUEy8PhrGZdObf0j0SKsdwAac5pmKtOlH3+JKgRogRfWWgeIIqncV8A46JeyEeHiYWh9TDMgWW93A= 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 1629203216922997.4252549915909; Tue, 17 Aug 2021 05:26:56 -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-386-HKy6i5_aMamuLj7yHnVRNA-1; Tue, 17 Aug 2021 08:26:53 -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 70BADC744A; Tue, 17 Aug 2021 12:26:47 +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 4C2CA5DD68; Tue, 17 Aug 2021 12:26:47 +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 199744A7CA; Tue, 17 Aug 2021 12:26:47 +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 17HCPgk6018150 for ; Tue, 17 Aug 2021 08:25:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2CF9660916; Tue, 17 Aug 2021 12:25:42 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8562E60854 for ; Tue, 17 Aug 2021 12:25:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629203215; 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=s8YE6JdscYiCP8xyKM/GEkOqvSzOJeTL+rRLPMRRo08=; b=VEa/4pQRVwUFeLXjkItdHDwcJfruw3MEV/YT1MC/TD87Bf0GvexzsEI+1/iPvPCUyHIU/g pM76fHPHv/6WHUNiBqAhrlKRo+TejuXSUp54W1ZA29iZJpsazh1dt4PSmBV631hk4ftxSj 9Z0djaincMIiJioKu/AtUkolP7mEWpE= X-MC-Unique: HKy6i5_aMamuLj7yHnVRNA-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 4/6] Use g_auto for xmlFreeDoc everywhere Date: Tue, 17 Aug 2021 14:25:31 +0200 Message-Id: <90bc34fa4726092b8e7760072fd7227f8f939177.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.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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1629203217374100001 Signed-off-by: J=C3=A1n Tomko Reviewed-by: Pavel Hrdina --- src/conf/checkpoint_conf.c | 3 +-- src/conf/cpu_conf.c | 3 +-- src/conf/domain_conf.c | 6 ++---- src/conf/interface_conf.c | 3 +-- src/conf/node_device_conf.c | 3 +-- src/conf/nwfilter_conf.c | 3 +-- src/conf/secret_conf.c | 3 +-- src/conf/snapshot_conf.c | 3 +-- src/conf/storage_conf.c | 6 ++---- 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/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 | 10 +++------- src/util/virxml.c | 3 +-- src/vbox/vbox_snapshot_conf.c | 12 ++++-------- 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 +-- 28 files changed, 36 insertions(+), 74 deletions(-) diff --git a/src/conf/checkpoint_conf.c b/src/conf/checkpoint_conf.c index d2041dd0ac..4731f21aba 100644 --- a/src/conf/checkpoint_conf.c +++ b/src/conf/checkpoint_conf.c @@ -213,7 +213,7 @@ virDomainCheckpointDefParseString(const char *xmlStr, unsigned int flags) { virDomainCheckpointDef *ret =3D NULL; - xmlDocPtr xml; + g_autoptr(xmlDoc) xml =3D NULL; int keepBlanksDefault =3D xmlKeepBlanksDefault(0); =20 if ((xml =3D virXMLParse(NULL, xmlStr, _("(domain_checkpoint)"), @@ -221,7 +221,6 @@ virDomainCheckpointDefParseString(const char *xmlStr, xmlKeepBlanksDefault(keepBlanksDefault); ret =3D virDomainCheckpointDefParseNode(xml, xmlDocGetRootElement(= xml), xmlopt, parseOpaque, flags); - xmlFreeDoc(xml); } xmlKeepBlanksDefault(keepBlanksDefault); =20 diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index dac7af4bf4..4434120557 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -281,7 +281,7 @@ virCPUDefParseXMLString(const char *xml, virCPUDef **cpu, bool validateXML) { - xmlDocPtr doc =3D NULL; + g_autoptr(xmlDoc) doc =3D NULL; g_autoptr(xmlXPathContext) ctxt =3D NULL; int ret =3D -1; =20 @@ -299,7 +299,6 @@ virCPUDefParseXMLString(const char *xml, ret =3D 0; =20 cleanup: - xmlFreeDoc(doc); return ret; } =20 diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 926f831073..10effdce69 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -20377,7 +20377,7 @@ virDomainDefParse(const char *xmlStr, void *parseOpaque, unsigned int flags) { - xmlDocPtr xml =3D NULL; + g_autoptr(xmlDoc) xml =3D NULL; virDomainDef *def =3D NULL; int keepBlanksDefault =3D xmlKeepBlanksDefault(0); xmlNodePtr root; @@ -20397,7 +20397,6 @@ virDomainDefParse(const char *xmlStr, def =3D virDomainDefParseNode(xml, root, xmlopt, parseOpaque, flags); =20 cleanup: - xmlFreeDoc(xml); xmlKeepBlanksDefault(keepBlanksDefault); return def; } @@ -20480,14 +20479,13 @@ virDomainObjParseFile(const char *filename, virDomainXMLOption *xmlopt, unsigned int flags) { - xmlDocPtr xml; + g_autoptr(xmlDoc) xml =3D NULL; virDomainObj *obj =3D NULL; int keepBlanksDefault =3D xmlKeepBlanksDefault(0); =20 if ((xml =3D virXMLParseFile(filename))) { obj =3D virDomainObjParseNode(xml, xmlDocGetRootElement(xml), xmlopt, flags); - xmlFreeDoc(xml); } =20 xmlKeepBlanksDefault(keepBlanksDefault); diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index c4b763d0de..c371a252a8 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -821,12 +821,11 @@ static virInterfaceDef * virInterfaceDefParse(const char *xmlStr, const char *filename) { - xmlDocPtr xml; + g_autoptr(xmlDoc) xml =3D NULL; virInterfaceDef *def =3D NULL; =20 if ((xml =3D virXMLParse(filename, xmlStr, _("(interface_definition)")= , NULL, false))) { def =3D virInterfaceDefParseNode(xml, xmlDocGetRootElement(xml)); - xmlFreeDoc(xml); } =20 return def; diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index bda1a11b37..b4c1acb6a5 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -2174,13 +2174,12 @@ virNodeDeviceDefParse(const char *str, virNodeDeviceDefParserCallbacks *parserCallbacks, void *opaque) { - xmlDocPtr xml; + g_autoptr(xmlDoc) xml =3D NULL; g_autoptr(virNodeDeviceDef) def =3D NULL; =20 if ((xml =3D virXMLParse(filename, str, _("(node_device_definition)"),= NULL, false))) { def =3D virNodeDeviceDefParseNode(xml, xmlDocGetRootElement(xml), create, virt_type); - xmlFreeDoc(xml); } =20 if (parserCallbacks) { diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index b7adae7161..7d491e27b1 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -2742,11 +2742,10 @@ virNWFilterDefParse(const char *xmlStr, const char *filename) { virNWFilterDef *def =3D NULL; - xmlDocPtr xml; + g_autoptr(xmlDoc) xml =3D NULL; =20 if ((xml =3D virXMLParse(filename, xmlStr, _("(nwfilter_definition)"),= NULL, false))) { def =3D virNWFilterDefParseNode(xml, xmlDocGetRootElement(xml)); - xmlFreeDoc(xml); } =20 return def; diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c index 5968b4365c..ef6a4b606e 100644 --- a/src/conf/secret_conf.c +++ b/src/conf/secret_conf.c @@ -193,12 +193,11 @@ static virSecretDef * virSecretDefParse(const char *xmlStr, const char *filename) { - xmlDocPtr xml; + g_autoptr(xmlDoc) xml =3D NULL; virSecretDef *ret =3D NULL; =20 if ((xml =3D virXMLParse(filename, xmlStr, _("(definition_of_secret)")= , NULL, false))) { ret =3D secretXMLParseNode(xml, xmlDocGetRootElement(xml)); - xmlFreeDoc(xml); } =20 return ret; diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index 6d3c59f98e..c765e4c815 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -447,7 +447,7 @@ virDomainSnapshotDefParseString(const char *xmlStr, unsigned int flags) { virDomainSnapshotDef *ret =3D NULL; - xmlDocPtr xml; + g_autoptr(xmlDoc) xml =3D NULL; int keepBlanksDefault =3D xmlKeepBlanksDefault(0); =20 if ((xml =3D virXMLParse(NULL, xmlStr, _("(domain_snapshot)"), "domain= snapshot.rng", @@ -456,7 +456,6 @@ virDomainSnapshotDefParseString(const char *xmlStr, ret =3D virDomainSnapshotDefParseNode(xml, xmlDocGetRootElement(xm= l), xmlopt, parseOpaque, current, flags); - xmlFreeDoc(xml); } xmlKeepBlanksDefault(keepBlanksDefault); =20 diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index e72e8d0ade..040a413d0f 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1007,11 +1007,10 @@ virStoragePoolDefParse(const char *xmlStr, const char *filename) { virStoragePoolDef *ret =3D NULL; - xmlDocPtr xml; + g_autoptr(xmlDoc) xml =3D NULL; =20 if ((xml =3D virXMLParse(filename, xmlStr, _("(storage_pool_definition= )"), NULL, false))) { ret =3D virStoragePoolDefParseNode(xml, xmlDocGetRootElement(xml)); - xmlFreeDoc(xml); } =20 return ret; @@ -1476,11 +1475,10 @@ virStorageVolDefParse(virStoragePoolDef *pool, unsigned int flags) { virStorageVolDef *ret =3D NULL; - xmlDocPtr xml; + g_autoptr(xmlDoc) xml =3D NULL; =20 if ((xml =3D virXMLParse(filename, xmlStr, _("(storage_volume_definiti= on)"), NULL, false))) { ret =3D virStorageVolDefParseNode(pool, xml, xmlDocGetRootElement(= xml), flags); - xmlFreeDoc(xml); } =20 return ret; diff --git a/src/conf/virnetworkportdef.c b/src/conf/virnetworkportdef.c index 8da05353b7..5e916ab2b8 100644 --- a/src/conf/virnetworkportdef.c +++ b/src/conf/virnetworkportdef.c @@ -294,11 +294,10 @@ virNetworkPortDefParse(const char *xmlStr, const char *filename) { virNetworkPortDef *def =3D NULL; - xmlDocPtr xml; + g_autoptr(xmlDoc) xml =3D NULL; =20 if ((xml =3D virXMLParse(filename, xmlStr, _("(networkport_definition)= "), NULL, false))) { def =3D virNetworkPortDefParseNode(xml, xmlDocGetRootElement(xml)); - xmlFreeDoc(xml); } =20 return def; diff --git a/src/conf/virnwfilterbindingdef.c b/src/conf/virnwfilterbinding= def.c index 45fa51a56c..3428b05841 100644 --- a/src/conf/virnwfilterbindingdef.c +++ b/src/conf/virnwfilterbindingdef.c @@ -185,11 +185,10 @@ virNWFilterBindingDefParse(const char *xmlStr, const char *filename) { virNWFilterBindingDef *def =3D NULL; - xmlDocPtr xml; + g_autoptr(xmlDoc) xml =3D NULL; =20 if ((xml =3D virXMLParse(filename, xmlStr, _("(nwfilterbinding_definit= ion)"), NULL, false))) { def =3D virNWFilterBindingDefParseNode(xml, xmlDocGetRootElement(x= ml)); - xmlFreeDoc(xml); } =20 return def; diff --git a/src/conf/virnwfilterbindingobj.c b/src/conf/virnwfilterbinding= obj.c index 20f33506fd..279e334d3f 100644 --- a/src/conf/virnwfilterbindingobj.c +++ b/src/conf/virnwfilterbindingobj.c @@ -262,11 +262,10 @@ virNWFilterBindingObjParse(const char *xmlStr, const char *filename) { virNWFilterBindingObj *obj =3D NULL; - xmlDocPtr xml; + g_autoptr(xmlDoc) xml =3D NULL; =20 if ((xml =3D virXMLParse(filename, xmlStr, _("(nwfilterbinding_status)= "), NULL, false))) { obj =3D virNWFilterBindingObjParseNode(xml, xmlDocGetRootElement(x= ml)); - xmlFreeDoc(xml); } =20 return obj; diff --git a/src/conf/virsavecookie.c b/src/conf/virsavecookie.c index b7e1e7df93..3bb97246af 100644 --- a/src/conf/virsavecookie.c +++ b/src/conf/virsavecookie.c @@ -79,7 +79,7 @@ virSaveCookieParseString(const char *xml, virObject **obj, virSaveCookieCallbacks *saveCookie) { - xmlDocPtr doc =3D NULL; + g_autoptr(xmlDoc) doc =3D NULL; g_autoptr(xmlXPathContext) ctxt =3D NULL; int ret =3D -1; =20 @@ -96,7 +96,6 @@ virSaveCookieParseString(const char *xml, ret =3D virSaveCookieParseNode(ctxt, obj, saveCookie); =20 cleanup: - xmlFreeDoc(doc); return ret; } =20 diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index 91c63b2c45..f8b85494c0 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -1643,7 +1643,7 @@ virStoragePoolObjLoadState(virStoragePoolObjList *poo= ls, { char *stateFile =3D NULL; virStoragePoolObj *obj =3D NULL; - xmlDocPtr xml =3D NULL; + g_autoptr(xmlDoc) xml =3D NULL; g_autoptr(xmlXPathContext) ctxt =3D NULL; xmlNodePtr node =3D NULL; g_autoptr(virStoragePoolDef) def =3D NULL; @@ -1687,7 +1687,6 @@ virStoragePoolObjLoadState(virStoragePoolObjList *poo= ls, =20 cleanup: VIR_FREE(stateFile); - xmlFreeDoc(xml); return obj; } =20 diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 817252bce9..a2c2b6dbde 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -148,7 +148,7 @@ libxlMigrationEatCookie(const char *cookiein, libxlMigrationCookie **migout) { libxlMigrationCookie *mig =3D NULL; - xmlDocPtr doc =3D NULL; + g_autoptr(xmlDoc) doc =3D NULL; g_autoptr(xmlXPathContext) ctxt =3D NULL; g_autofree char *uuidstr =3D NULL; int ret =3D -1; @@ -216,7 +216,6 @@ libxlMigrationEatCookie(const char *cookiein, libxlMigrationCookieFree(mig); =20 cleanup: - xmlFreeDoc(doc); return ret; } =20 diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index cecacb051b..535550754c 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -4191,7 +4191,7 @@ virQEMUCapsLoadCache(virArch hostArch, const char *filename, bool skipInvalidation) { - xmlDocPtr doc =3D NULL; + g_autoptr(xmlDoc) doc =3D NULL; int ret =3D -1; size_t i; int n; @@ -4421,7 +4421,6 @@ virQEMUCapsLoadCache(virArch hostArch, cleanup: VIR_FREE(str); VIR_FREE(nodes); - xmlFreeDoc(doc); return ret; } =20 diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_coo= kie.c index b4081b17e2..106897cacd 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -1431,7 +1431,7 @@ qemuMigrationCookieXMLParseStr(qemuMigrationCookie *m= ig, const char *xml, unsigned int flags) { - xmlDocPtr doc =3D NULL; + g_autoptr(xmlDoc) doc =3D NULL; g_autoptr(xmlXPathContext) ctxt =3D NULL; int ret =3D -1; =20 @@ -1443,7 +1443,6 @@ qemuMigrationCookieXMLParseStr(qemuMigrationCookie *m= ig, ret =3D qemuMigrationCookieXMLParse(mig, driver, qemuCaps, doc, ctxt, = flags); =20 cleanup: - xmlFreeDoc(doc); =20 return ret; } diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 2ba2a4a2b8..c0bbd7414a 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -568,7 +568,7 @@ static int caps_mockup(vahControl * ctl, const char *xmlStr) { int rc =3D -1; - xmlDocPtr xml =3D NULL; + g_autoptr(xmlDoc) xml =3D NULL; g_autoptr(xmlXPathContext) ctxt =3D NULL; char *arch; =20 @@ -607,7 +607,6 @@ caps_mockup(vahControl * ctl, const char *xmlStr) rc =3D 0; =20 cleanup: - xmlFreeDoc(xml); =20 return rc; } diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index 1beff7726a..7ee736535c 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -2892,7 +2892,7 @@ virStorageUtilGlusterExtractPoolSources(const char *h= ost, virStoragePoolSourceList *list, virStoragePoolType pooltype) { - xmlDocPtr doc =3D NULL; + g_autoptr(xmlDoc) doc =3D NULL; g_autoptr(xmlXPathContext) ctxt =3D NULL; virStoragePoolSource *src =3D NULL; size_t i; @@ -2940,7 +2940,6 @@ virStorageUtilGlusterExtractPoolSources(const char *h= ost, ret =3D nnodes; =20 cleanup: - xmlFreeDoc(doc); =20 return ret; } diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 6bb52e9302..b096d49ac6 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -825,7 +825,7 @@ static xmlNodePtr testParseXMLDocFromFile(xmlNodePtr node, const char *file, const char *typ= e) { xmlNodePtr ret =3D NULL; - xmlDocPtr doc =3D NULL; + g_autoptr(xmlDoc) doc =3D NULL; g_autofree char *absFile =3D NULL; g_autofree char *relFile =3D NULL; =20 @@ -848,7 +848,6 @@ testParseXMLDocFromFile(xmlNodePtr node, const char *fi= le, const char *type) } =20 error: - xmlFreeDoc(doc); return ret; } =20 @@ -1333,7 +1332,7 @@ testOpenParse(testDriver *privconn, static int testOpenFromFile(virConnectPtr conn, const char *file) { - xmlDocPtr doc =3D NULL; + g_autoptr(xmlDoc) doc =3D NULL; g_autoptr(xmlXPathContext) ctxt =3D NULL; testDriver *privconn; =20 @@ -1355,13 +1354,11 @@ testOpenFromFile(virConnectPtr conn, const char *fi= le) if (testOpenParse(privconn, file, ctxt) < 0) goto error; =20 - xmlFreeDoc(doc); virObjectUnlock(privconn); =20 return VIR_DRV_OPEN_SUCCESS; =20 error: - xmlFreeDoc(doc); virObjectUnref(privconn); conn->privateData =3D NULL; return VIR_DRV_OPEN_ERROR; @@ -1375,7 +1372,7 @@ testOpenDefault(virConnectPtr conn) { int ret =3D VIR_DRV_OPEN_ERROR; testDriver *privconn =3D NULL; - xmlDocPtr doc =3D NULL; + g_autoptr(xmlDoc) doc =3D NULL; g_autoptr(xmlXPathContext) ctxt =3D NULL; size_t i; =20 @@ -1424,7 +1421,6 @@ testOpenDefault(virConnectPtr conn) ret =3D VIR_DRV_OPEN_SUCCESS; cleanup: virMutexUnlock(&defaultLock); - xmlFreeDoc(doc); return ret; =20 error: diff --git a/src/util/virxml.c b/src/util/virxml.c index 61e3d91640..b736d59d9c 100644 --- a/src/util/virxml.c +++ b/src/util/virxml.c @@ -1619,12 +1619,11 @@ int virXMLValidateNodeAgainstSchema(const char *schemafile, xmlNodePtr node) { int ret; - xmlDocPtr copy =3D xmlNewDoc(NULL); + g_autoptr(xmlDoc) copy =3D xmlNewDoc(NULL); =20 xmlDocSetRootElement(copy, xmlCopyNode(node, true)); ret =3D virXMLValidateAgainstSchema(schemafile, copy); =20 - xmlFreeDoc(copy); return ret; } =20 diff --git a/src/vbox/vbox_snapshot_conf.c b/src/vbox/vbox_snapshot_conf.c index 0f30aef108..65546b785e 100644 --- a/src/vbox/vbox_snapshot_conf.c +++ b/src/vbox/vbox_snapshot_conf.c @@ -575,7 +575,7 @@ virVBoxSnapshotConfLoadVboxFile(const char *filePath, { int ret =3D -1; virVBoxSnapshotConfMachine *machineDescription =3D NULL; - xmlDocPtr xml =3D NULL; + g_autoptr(xmlDoc) xml =3D NULL; xmlNodePtr machineNode =3D NULL; xmlNodePtr cur =3D NULL; g_autoptr(xmlXPathContext) xPathContext =3D NULL; @@ -716,7 +716,6 @@ virVBoxSnapshotConfLoadVboxFile(const char *filePath, ret =3D 0; =20 cleanup: - xmlFreeDoc(xml); =20 VIR_FREE(currentStateModifiedString); VIR_FREE(currentSnapshotAttribute); @@ -954,7 +953,7 @@ virVBoxSnapshotConfSaveVboxFile(virVBoxSnapshotConfMach= ine *machine, { int ret =3D -1; size_t i =3D 0; - xmlDocPtr xml =3D NULL; + g_autoptr(xmlDoc) xml =3D NULL; xmlNodePtr mediaRegistryNode =3D NULL; xmlNodePtr snapshotNode =3D NULL; xmlNodePtr machineNode =3D NULL; @@ -1172,7 +1171,6 @@ virVBoxSnapshotConfSaveVboxFile(virVBoxSnapshotConfMa= chine *machine, xmlUnlinkNode(machineNode); xmlFreeNode(machineNode); =20 - xmlFreeDoc(xml); =20 g_strfreev(firstRegex); g_strfreev(secondRegex); @@ -1219,7 +1217,7 @@ virVBoxSnapshotConfGetRWDisksPathsFromLibvirtXML(cons= t char *filePath, int result =3D -1; size_t i =3D 0; char **ret =3D NULL; - xmlDocPtr xml =3D NULL; + g_autoptr(xmlDoc) xml =3D NULL; g_autoptr(xmlXPathContext) xPathContext =3D NULL; xmlNodePtr *nodes =3D NULL; int nodeSize =3D 0; @@ -1258,7 +1256,6 @@ virVBoxSnapshotConfGetRWDisksPathsFromLibvirtXML(cons= t char *filePath, result =3D 0; =20 cleanup: - xmlFreeDoc(xml); if (result < 0) { g_strfreev(ret); nodeSize =3D -1; @@ -1281,7 +1278,7 @@ virVBoxSnapshotConfGetRODisksPathsFromLibvirtXML(cons= t char *filePath, int result =3D -1; size_t i =3D 0; char **ret =3D NULL; - xmlDocPtr xml =3D NULL; + g_autoptr(xmlDoc) xml =3D NULL; g_autoptr(xmlXPathContext) xPathContext =3D NULL; xmlNodePtr *nodes =3D NULL; int nodeSize =3D 0; @@ -1319,7 +1316,6 @@ virVBoxSnapshotConfGetRODisksPathsFromLibvirtXML(cons= t char *filePath, result =3D 0; =20 cleanup: - xmlFreeDoc(xml); if (result < 0) { g_strfreev(ret); nodeSize =3D -1; diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index edc4327550..9eba9d47fb 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -2789,7 +2789,7 @@ vzBakeCookie(struct _vzDriver *driver, static vzMigrationCookie * vzEatCookie(const char *cookiein, int cookieinlen, unsigned int flags) { - xmlDocPtr doc =3D NULL; + g_autoptr(xmlDoc) doc =3D NULL; g_autoptr(xmlXPathContext) ctx =3D NULL; vzMigrationCookie *mig =3D NULL; =20 @@ -2838,7 +2838,6 @@ vzEatCookie(const char *cookiein, int cookieinlen, un= signed int flags) } =20 cleanup: - xmlFreeDoc(doc); return mig; =20 error: diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 5a747913b5..2ba48134b0 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -4578,7 +4578,7 @@ static virDomainSnapshotObjList * prlsdkParseSnapshotTree(const char *treexml) { virDomainSnapshotObjList *ret =3D NULL; - xmlDocPtr xml =3D NULL; + g_autoptr(xmlDoc) xml =3D NULL; g_autoptr(xmlXPathContext) ctxt =3D NULL; xmlNodePtr root; xmlNodePtr *nodes =3D NULL; @@ -4696,7 +4696,6 @@ prlsdkParseSnapshotTree(const char *treexml) virDomainSnapshotObjListFree(snapshots); VIR_FREE(nodes); VIR_FREE(xmlstr); - xmlFreeDoc(xml); VIR_FREE(def); =20 return ret; diff --git a/tests/cputest.c b/tests/cputest.c index 34d9e8ddb0..d19ded4b40 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -71,7 +71,7 @@ static virCPUDef * cpuTestLoadXML(virArch arch, const char *name) { char *xml =3D NULL; - xmlDocPtr doc =3D NULL; + g_autoptr(xmlDoc) doc =3D NULL; g_autoptr(xmlXPathContext) ctxt =3D NULL; virCPUDef *cpu =3D NULL; =20 @@ -84,7 +84,6 @@ cpuTestLoadXML(virArch arch, const char *name) virCPUDefParseXML(ctxt, NULL, VIR_CPU_TYPE_AUTO, &cpu, false); =20 cleanup: - xmlFreeDoc(doc); VIR_FREE(xml); return cpu; } @@ -96,7 +95,7 @@ cpuTestLoadMultiXML(virArch arch, unsigned int *count) { char *xml =3D NULL; - xmlDocPtr doc =3D NULL; + g_autoptr(xmlDoc) doc =3D NULL; g_autoptr(xmlXPathContext) ctxt =3D NULL; xmlNodePtr *nodes =3D NULL; virCPUDef **cpus =3D NULL; @@ -129,7 +128,6 @@ cpuTestLoadMultiXML(virArch arch, cleanup: VIR_FREE(xml); VIR_FREE(nodes); - xmlFreeDoc(doc); return cpus; =20 cleanup_cpus: diff --git a/tests/metadatatest.c b/tests/metadatatest.c index ceb683028c..2bcb0a1225 100644 --- a/tests/metadatatest.c +++ b/tests/metadatatest.c @@ -56,7 +56,7 @@ static const char metadata2_ns[] =3D static char * getMetadataFromXML(virDomainPtr dom) { - xmlDocPtr doc =3D NULL; + g_autoptr(xmlDoc) doc =3D NULL; g_autoptr(xmlXPathContext) ctxt =3D NULL; xmlNodePtr node; =20 @@ -76,7 +76,6 @@ getMetadataFromXML(virDomainPtr dom) =20 cleanup: VIR_FREE(xml); - xmlFreeDoc(doc); =20 return ret; } diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c index 35eb27c1fb..ce1116b792 100644 --- a/tests/qemucaps2xmltest.c +++ b/tests/qemucaps2xmltest.c @@ -51,7 +51,7 @@ static virQEMUCaps * testQemuGetCaps(char *caps) { virQEMUCaps *qemuCaps =3D NULL; - xmlDocPtr xml; + g_autoptr(xmlDoc) xml =3D NULL; g_autoptr(xmlXPathContext) ctxt =3D NULL; ssize_t i, n; g_autofree xmlNodePtr *nodes =3D NULL; @@ -79,12 +79,10 @@ testQemuGetCaps(char *caps) } } =20 - xmlFreeDoc(xml); return qemuCaps; =20 error: virObjectUnref(qemuCaps); - xmlFreeDoc(xml); return NULL; } =20 diff --git a/tests/virnetdevbandwidthtest.c b/tests/virnetdevbandwidthtest.c index 51ceae5a6a..83e7b2089f 100644 --- a/tests/virnetdevbandwidthtest.c +++ b/tests/virnetdevbandwidthtest.c @@ -42,7 +42,7 @@ struct testSetStruct { #define PARSE(xml, var) \ do { \ int rc; \ - xmlDocPtr doc; \ + g_autoptr(xmlDoc) doc =3D NULL; \ g_autoptr(xmlXPathContext) ctxt =3D NULL; \ \ if (!xml) \ @@ -57,7 +57,6 @@ struct testSetStruct { NULL, \ ctxt->node, \ true); \ - xmlFreeDoc(doc); \ if (rc < 0) \ goto cleanup; \ } while (0) --=20 2.31.1 From nobody Sat Apr 27 06:25:57 2024 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=1629203218; cv=none; d=zohomail.com; s=zohoarc; b=erKtOyFYRZz05fUEcXnI1/8uzPOMz/LPPGprUUNNTzrDfJYA3HAmF2bpjvGXzNDgVCx3MibO+5lZjby5ahaHQIHLOFMxG11D7listiHBxpbeZbiQLWU3ZJKBmel7vXhaOOsTONb+bMefjMQhx/x1agWdkmsQ9Wu9p7PavdPNFVs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629203218; 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=niKplBZ6ozsnRy/XV3jINEI/mBfAwSE6CQiiO1OHfC8=; b=clQiLq3bx+q8Mcc7inC4l5wabKxf7VVxs3ZKqCKC5VnwKdvzRz8AWtQxmHaIFt3adpvq/vqLbmTX5LLvumJCnYw0vKUYzR3d304BCYnhrjdx6kQ102F/QROWflldE+Tc3xEKKkQHYxWI8iB5qoupKDMOKaQb3wt9W4OZgfgDOkM= 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 1629203218537962.3497534316954; Tue, 17 Aug 2021 05:26:58 -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-262-3bUpUEL2Noi-vPUWcnIiJg-1; Tue, 17 Aug 2021 08:26:55 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3C4301019629; Tue, 17 Aug 2021 12:26:50 +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 161A21045D1C; Tue, 17 Aug 2021 12:26:50 +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 D79FC4A700; Tue, 17 Aug 2021 12:26:49 +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 17HCPgPG018165 for ; Tue, 17 Aug 2021 08:25:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id EE55C60871; Tue, 17 Aug 2021 12:25:42 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 78EF360854 for ; Tue, 17 Aug 2021 12:25:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629203217; 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=niKplBZ6ozsnRy/XV3jINEI/mBfAwSE6CQiiO1OHfC8=; b=TgS4K+Wyr8fOg3OCaRhYb7MxDz1kHs329pVNninPSjP8G+FePrFsJRSE1adGCkf26a16SC JbHlyozZlrUPmBk56Nlnp0p9U9tKF0aNPa7Jf7EhZe6a9eqN5x+fHNLKV8r38GW0XE28Dj XURWIOeuXhOB4yI+O1bAhOZF7HDBSxo= X-MC-Unique: 3bUpUEL2Noi-vPUWcnIiJg-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 5/6] Use g_autofree in affected functions Date: Tue, 17 Aug 2021 14:25:32 +0200 Message-Id: <3a8f3b5787d249db2447838b2338e35ff939c444.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.84 on 10.5.11.22 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: 1629203219554100001 Add g_autofree to functions changed in previous commits doing g_auto cleanup for libxml2-related variables, where it could lead to removal of a label. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Pavel Hrdina --- src/conf/virstorageobj.c | 3 +-- tests/cputest.c | 9 +++------ tests/metadatatest.c | 3 +-- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index f8b85494c0..1f6fedba13 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -1641,7 +1641,7 @@ virStoragePoolObjLoadState(virStoragePoolObjList *poo= ls, const char *stateDir, const char *name) { - char *stateFile =3D NULL; + g_autofree char *stateFile =3D NULL; virStoragePoolObj *obj =3D NULL; g_autoptr(xmlDoc) xml =3D NULL; g_autoptr(xmlXPathContext) ctxt =3D NULL; @@ -1686,7 +1686,6 @@ virStoragePoolObjLoadState(virStoragePoolObjList *poo= ls, obj->active =3D true; =20 cleanup: - VIR_FREE(stateFile); return obj; } =20 diff --git a/tests/cputest.c b/tests/cputest.c index d19ded4b40..14606f5864 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -70,7 +70,7 @@ static virQEMUDriver driver; static virCPUDef * cpuTestLoadXML(virArch arch, const char *name) { - char *xml =3D NULL; + g_autofree char *xml =3D NULL; g_autoptr(xmlDoc) doc =3D NULL; g_autoptr(xmlXPathContext) ctxt =3D NULL; virCPUDef *cpu =3D NULL; @@ -84,7 +84,6 @@ cpuTestLoadXML(virArch arch, const char *name) virCPUDefParseXML(ctxt, NULL, VIR_CPU_TYPE_AUTO, &cpu, false); =20 cleanup: - VIR_FREE(xml); return cpu; } =20 @@ -94,10 +93,10 @@ cpuTestLoadMultiXML(virArch arch, const char *name, unsigned int *count) { - char *xml =3D NULL; + g_autofree char *xml =3D NULL; g_autoptr(xmlDoc) doc =3D NULL; g_autoptr(xmlXPathContext) ctxt =3D NULL; - xmlNodePtr *nodes =3D NULL; + g_autofree xmlNodePtr *nodes =3D NULL; virCPUDef **cpus =3D NULL; int n; size_t i; @@ -126,8 +125,6 @@ cpuTestLoadMultiXML(virArch arch, *count =3D n; =20 cleanup: - VIR_FREE(xml); - VIR_FREE(nodes); return cpus; =20 cleanup_cpus: diff --git a/tests/metadatatest.c b/tests/metadatatest.c index 2bcb0a1225..2c560c27c1 100644 --- a/tests/metadatatest.c +++ b/tests/metadatatest.c @@ -60,7 +60,7 @@ getMetadataFromXML(virDomainPtr dom) g_autoptr(xmlXPathContext) ctxt =3D NULL; xmlNodePtr node; =20 - char *xml =3D NULL; + g_autofree char *xml =3D NULL; char *ret =3D NULL; =20 if (!(xml =3D virDomainGetXMLDesc(dom, 0))) @@ -75,7 +75,6 @@ getMetadataFromXML(virDomainPtr dom) ret =3D virXMLNodeToString(node->doc, node); =20 cleanup: - VIR_FREE(xml); =20 return ret; } --=20 2.31.1 From nobody Sat Apr 27 06:25:57 2024 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=1629203153; cv=none; d=zohomail.com; s=zohoarc; b=BP5ESOkoA7ylcipz/mRhCKX8UedAbSZsdIPEe2uBCe3gFiFtTKD47KocSSw+Xop3pf7lzklpdpU867T0xHpD+t0E0BBAI7NSyGsI9LNx/iECoH9GmZkRAccU9IDCMbwyu+6zJAtgkyw7/VDudnqVZ0KipmedztkBws2Kxu/vhDo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629203153; 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=OvJUUIwYfknk+mjktKNhUASvImyrTI0Utin1XKu8nmo=; b=FHKn6jUmKhL7IC1PnTX1dMtBq9XVOgOFhZZF4Y8J0kM+4/n0B0Gv0PNefNFwKxhWJK1ka5Wdlo0q5iSY5HlGEoVFC/8LRUZBx+Cz2DfMaiGT2f3TxZ2TjD8wo795kqnZv1Cu6yOERhhZH81tmllBT8pFA3o4h0w/UVSkR1TgzA0= 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 1629203153938458.1258643290163; Tue, 17 Aug 2021 05:25: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-452-YIACK7gnPMGGtoYr1ITeqw-1; Tue, 17 Aug 2021 08:25:50 -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 8E655801AC0; Tue, 17 Aug 2021 12:25:45 +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 F396160C0F; Tue, 17 Aug 2021 12:25: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 7C953181A0F7; Tue, 17 Aug 2021 12:25: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 17HCPhEH018179 for ; Tue, 17 Aug 2021 08:25:43 -0400 Received: by smtp.corp.redhat.com (Postfix) id BC99360871; Tue, 17 Aug 2021 12:25:43 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4710260854 for ; Tue, 17 Aug 2021 12:25:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629203152; 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=OvJUUIwYfknk+mjktKNhUASvImyrTI0Utin1XKu8nmo=; b=Rio5b+mCycUJ33NSyp4Aa3XlAjkaI53K53lC24dzpnRESj9yVxnpjIMR1H1EIggsW6qVTh cRzYKl42OAvsgaZ/7XKxy0VaI+R+6ahdOyevZy0QJ+4qQ0qpZ61ZBtESS7NFJnC0i8G+wp gXlMq+1BwB73Jt4prHOMLuEaUySkijE= X-MC-Unique: YIACK7gnPMGGtoYr1ITeqw-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 6/6] Remove redundant labels Date: Tue, 17 Aug 2021 14:25:33 +0200 Message-Id: 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.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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1629203154657100001 Signed-off-by: J=C3=A1n Tomko Reviewed-by: Martin Kletzander Reviewed-by: Pavel Hrdina --- src/conf/cpu_conf.c | 12 ++++-------- src/conf/virnetworkportdef.c | 10 +++------- src/conf/virnwfilterbindingdef.c | 10 +++------- src/conf/virnwfilterbindingobj.c | 10 +++------- src/conf/virsavecookie.c | 14 ++++---------- src/conf/virstorageobj.c | 12 +++++------- src/libxl/libxl_migration.c | 8 ++------ src/qemu/qemu_migration_cookie.c | 9 ++------- src/security/virt-aa-helper.c | 17 ++++++----------- src/storage/storage_util.c | 17 ++++++----------- src/vz/vz_driver.c | 4 +--- tests/cputest.c | 14 ++++++-------- tests/metadatatest.c | 13 ++++--------- 13 files changed, 49 insertions(+), 101 deletions(-) diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index 4434120557..1674cd6957 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -283,23 +283,19 @@ virCPUDefParseXMLString(const char *xml, { g_autoptr(xmlDoc) doc =3D NULL; g_autoptr(xmlXPathContext) ctxt =3D NULL; - int ret =3D -1; =20 if (!xml) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("missing CPU definitio= n")); - goto cleanup; + return -1; } =20 if (!(doc =3D virXMLParseStringCtxt(xml, _("(CPU_definition)"), &ctxt)= )) - goto cleanup; + return -1; =20 if (virCPUDefParseXML(ctxt, NULL, type, cpu, validateXML) < 0) - goto cleanup; + return -1; =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 diff --git a/src/conf/virnetworkportdef.c b/src/conf/virnetworkportdef.c index 5e916ab2b8..c1749eebe0 100644 --- a/src/conf/virnetworkportdef.c +++ b/src/conf/virnetworkportdef.c @@ -269,23 +269,19 @@ virNetworkPortDefParseNode(xmlDocPtr xml, xmlNodePtr root) { g_autoptr(xmlXPathContext) ctxt =3D NULL; - virNetworkPortDef *def =3D NULL; =20 if (STRNEQ((const char *)root->name, "networkport")) { virReportError(VIR_ERR_XML_ERROR, "%s", _("unknown root element for network port")); - goto cleanup; + return NULL; } =20 if (!(ctxt =3D virXMLXPathContextNew(xml))) - goto cleanup; + return NULL; =20 ctxt->node =3D root; - def =3D virNetworkPortDefParseXML(ctxt); - - cleanup: - return def; + return virNetworkPortDefParseXML(ctxt); } =20 =20 diff --git a/src/conf/virnwfilterbindingdef.c b/src/conf/virnwfilterbinding= def.c index 3428b05841..5f671030bb 100644 --- a/src/conf/virnwfilterbindingdef.c +++ b/src/conf/virnwfilterbindingdef.c @@ -160,23 +160,19 @@ virNWFilterBindingDefParseNode(xmlDocPtr xml, xmlNodePtr root) { g_autoptr(xmlXPathContext) ctxt =3D NULL; - virNWFilterBindingDef *def =3D NULL; =20 if (STRNEQ((const char *)root->name, "filterbinding")) { virReportError(VIR_ERR_XML_ERROR, "%s", _("unknown root element for nwfilter binding")); - goto cleanup; + return NULL; } =20 if (!(ctxt =3D virXMLXPathContextNew(xml))) - goto cleanup; + return NULL; =20 ctxt->node =3D root; - def =3D virNWFilterBindingDefParseXML(ctxt); - - cleanup: - return def; + return virNWFilterBindingDefParseXML(ctxt); } =20 =20 diff --git a/src/conf/virnwfilterbindingobj.c b/src/conf/virnwfilterbinding= obj.c index 279e334d3f..29fbb63b5f 100644 --- a/src/conf/virnwfilterbindingobj.c +++ b/src/conf/virnwfilterbindingobj.c @@ -237,23 +237,19 @@ virNWFilterBindingObjParseNode(xmlDocPtr doc, xmlNodePtr root) { g_autoptr(xmlXPathContext) ctxt =3D NULL; - virNWFilterBindingObj *obj =3D NULL; =20 if (STRNEQ((const char *)root->name, "filterbindingstatus")) { virReportError(VIR_ERR_XML_ERROR, _("unknown root element '%s' for filter binding"), root->name); - goto cleanup; + return NULL; } =20 if (!(ctxt =3D virXMLXPathContextNew(doc))) - goto cleanup; + return NULL; =20 ctxt->node =3D root; - obj =3D virNWFilterBindingObjParseXML(doc, ctxt); - - cleanup: - return obj; + return virNWFilterBindingObjParseXML(doc, ctxt); } =20 =20 diff --git a/src/conf/virsavecookie.c b/src/conf/virsavecookie.c index 3bb97246af..6cb7fafb1f 100644 --- a/src/conf/virsavecookie.c +++ b/src/conf/virsavecookie.c @@ -81,22 +81,16 @@ virSaveCookieParseString(const char *xml, { g_autoptr(xmlDoc) doc =3D NULL; g_autoptr(xmlXPathContext) ctxt =3D NULL; - int ret =3D -1; =20 *obj =3D NULL; =20 - if (!xml) { - ret =3D 0; - goto cleanup; - } + if (!xml) + return 0; =20 if (!(doc =3D virXMLParseStringCtxt(xml, _("(save cookie)"), &ctxt))) - goto cleanup; + return -1; =20 - ret =3D virSaveCookieParseNode(ctxt, obj, saveCookie); - - cleanup: - return ret; + return virSaveCookieParseNode(ctxt, obj, saveCookie); } =20 =20 diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index 1f6fedba13..f906c5b141 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -1652,30 +1652,30 @@ virStoragePoolObjLoadState(virStoragePoolObjList *p= ools, return NULL; =20 if (!(xml =3D virXMLParseCtxt(stateFile, NULL, _("(pool state)"), &ctx= t))) - goto cleanup; + return NULL; =20 if (!(node =3D virXPathNode("//pool", ctxt))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not find any 'pool' element in state file"= )); - goto cleanup; + return NULL; } =20 ctxt->node =3D node; if (!(def =3D virStoragePoolDefParseXML(ctxt))) - goto cleanup; + return NULL; =20 if (STRNEQ(name, def->name)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Storage pool state file '%s' does not match " "pool name '%s'"), stateFile, def->name); - goto cleanup; + return NULL; } =20 /* create the object */ if (!(obj =3D virStoragePoolObjListAdd(pools, def, VIR_STORAGE_POOL_OBJ_LIST_ADD_CHE= CK_LIVE))) - goto cleanup; + return NULL; def =3D NULL; =20 /* XXX: future handling of some additional useful status data, @@ -1684,8 +1684,6 @@ virStoragePoolObjLoadState(virStoragePoolObjList *poo= ls, */ =20 obj->active =3D true; - - cleanup: return obj; } =20 diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index a2c2b6dbde..aa719a19d2 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -151,7 +151,6 @@ libxlMigrationEatCookie(const char *cookiein, g_autoptr(xmlDoc) doc =3D NULL; g_autoptr(xmlXPathContext) ctxt =3D NULL; g_autofree char *uuidstr =3D NULL; - int ret =3D -1; =20 /* * Assume a legacy (V1) migration stream if request came from a @@ -209,14 +208,11 @@ libxlMigrationEatCookie(const char *cookiein, } =20 *migout =3D mig; - ret =3D 0; - goto cleanup; + return 0; =20 error: libxlMigrationCookieFree(mig); - - cleanup: - return ret; + return -1; } =20 static void diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_coo= kie.c index 106897cacd..b67728f9c0 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -1433,18 +1433,13 @@ qemuMigrationCookieXMLParseStr(qemuMigrationCookie = *mig, { g_autoptr(xmlDoc) doc =3D NULL; g_autoptr(xmlXPathContext) ctxt =3D NULL; - int ret =3D -1; =20 VIR_DEBUG("xml=3D%s", NULLSTR(xml)); =20 if (!(doc =3D virXMLParseStringCtxt(xml, _("(qemu_migration_cookie)"),= &ctxt))) - goto cleanup; + return -1; =20 - ret =3D qemuMigrationCookieXMLParse(mig, driver, qemuCaps, doc, ctxt, = flags); - - cleanup: - - return ret; + return qemuMigrationCookieXMLParse(mig, driver, qemuCaps, doc, ctxt, f= lags); } =20 =20 diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index c0bbd7414a..77b2307594 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -567,34 +567,33 @@ verify_xpath_context(xmlXPathContextPtr ctxt) static int caps_mockup(vahControl * ctl, const char *xmlStr) { - int rc =3D -1; g_autoptr(xmlDoc) xml =3D NULL; g_autoptr(xmlXPathContext) ctxt =3D NULL; char *arch; =20 if (!(xml =3D virXMLParseStringCtxt(xmlStr, _("(domain_definition)"), &ctxt))) { - goto cleanup; + return -1; } =20 if (!virXMLNodeNameEqual(ctxt->node, "domain")) { vah_error(NULL, 0, _("unexpected root element, expecting "= )); - goto cleanup; + return -1; } =20 /* Quick sanity check for some required elements */ if (verify_xpath_context(ctxt) !=3D 0) - goto cleanup; + return -1; =20 ctl->virtType =3D virXPathString("string(./@type)", ctxt); if (!ctl->virtType) { vah_error(ctl, 0, _("domain type is not defined")); - goto cleanup; + return -1; } ctl->os =3D virXPathString("string(./os/type[1])", ctxt); if (!ctl->os) { vah_error(ctl, 0, _("os.type is not defined")); - goto cleanup; + return -1; } arch =3D virXPathString("string(./os/type[1]/@arch)", ctxt); if (!arch) { @@ -604,11 +603,7 @@ caps_mockup(vahControl * ctl, const char *xmlStr) VIR_FREE(arch); } =20 - rc =3D 0; - - cleanup: - - return rc; + return 0; } =20 virDomainDefParserConfig virAAHelperDomainDefParserConfig =3D { diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index 7ee736535c..53792765ff 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -2897,26 +2897,25 @@ virStorageUtilGlusterExtractPoolSources(const char = *host, virStoragePoolSource *src =3D NULL; size_t i; int nnodes; - int ret =3D -1; g_autofree xmlNodePtr *nodes =3D NULL; g_autofree char *volname =3D NULL; =20 if (!(doc =3D virXMLParseStringCtxt(xml, _("(gluster_cli_output)"), &c= txt))) - goto cleanup; + return -1; =20 if ((nnodes =3D virXPathNodeSet("//volumes/volume", ctxt, &nodes)) < 0) - goto cleanup; + return -1; =20 for (i =3D 0; i < nnodes; i++) { ctxt->node =3D nodes[i]; =20 if (!(src =3D virStoragePoolSourceListNewSource(list))) - goto cleanup; + return -1; =20 if (!(volname =3D virXPathString("string(./name)", ctxt))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to extract gluster volume name")); - goto cleanup; + return -1; } =20 if (pooltype =3D=3D VIR_STORAGE_POOL_NETFS) { @@ -2928,7 +2927,7 @@ virStorageUtilGlusterExtractPoolSources(const char *h= ost, } else { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("unsupported gluster lookup")); - goto cleanup; + return -1; } =20 src->hosts =3D g_new0(virStoragePoolSourceHost, 1); @@ -2937,11 +2936,7 @@ virStorageUtilGlusterExtractPoolSources(const char *= host, src->hosts[0].name =3D g_strdup(host); } =20 - ret =3D nnodes; - - cleanup: - - return ret; + return nnodes; } =20 =20 diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 9eba9d47fb..a1d05f834b 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -2837,13 +2837,11 @@ vzEatCookie(const char *cookiein, int cookieinlen, = unsigned int flags) goto error; } =20 - cleanup: return mig; =20 error: vzMigrationCookieFree(mig); - mig =3D NULL; - goto cleanup; + return NULL; } =20 #define VZ_MIGRATION_FLAGS (VIR_MIGRATE_PAUSED | \ diff --git a/tests/cputest.c b/tests/cputest.c index 14606f5864..7816de87f7 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -79,11 +79,10 @@ cpuTestLoadXML(virArch arch, const char *name) virArchToString(arch), name); =20 if (!(doc =3D virXMLParseFileCtxt(xml, &ctxt))) - goto cleanup; + return NULL; =20 virCPUDefParseXML(ctxt, NULL, VIR_CPU_TYPE_AUTO, &cpu, false); =20 - cleanup: return cpu; } =20 @@ -105,12 +104,12 @@ cpuTestLoadMultiXML(virArch arch, virArchToString(arch), name); =20 if (!(doc =3D virXMLParseFileCtxt(xml, &ctxt))) - goto cleanup; + return NULL; =20 n =3D virXPathNodeSet("/cpuTest/cpu", ctxt, &nodes); if (n <=3D 0) { fprintf(stderr, "\nNo /cpuTest/cpu elements found in %s\n", xml); - goto cleanup; + return NULL; } =20 cpus =3D g_new0(virCPUDef *, n); @@ -119,19 +118,18 @@ cpuTestLoadMultiXML(virArch arch, ctxt->node =3D nodes[i]; if (virCPUDefParseXML(ctxt, NULL, VIR_CPU_TYPE_HOST, &cpus[i], false) < 0) - goto cleanup_cpus; + goto error; } =20 *count =3D n; =20 - cleanup: return cpus; =20 - cleanup_cpus: + error: for (i =3D 0; i < n; i++) virCPUDefFree(cpus[i]); VIR_FREE(cpus); - goto cleanup; + return NULL; } =20 =20 diff --git a/tests/metadatatest.c b/tests/metadatatest.c index 2c560c27c1..e565383ce2 100644 --- a/tests/metadatatest.c +++ b/tests/metadatatest.c @@ -61,22 +61,17 @@ getMetadataFromXML(virDomainPtr dom) xmlNodePtr node; =20 g_autofree char *xml =3D NULL; - char *ret =3D NULL; =20 if (!(xml =3D virDomainGetXMLDesc(dom, 0))) - goto cleanup; + return NULL; =20 if (!(doc =3D virXMLParseStringCtxt(xml, "(domain_definition)", &ctxt)= )) - goto cleanup; + return NULL; =20 if (!(node =3D virXPathNode("//metadata/*", ctxt))) - goto cleanup; + return NULL; =20 - ret =3D virXMLNodeToString(node->doc, node); - - cleanup: - - return ret; + return virXMLNodeToString(node->doc, node); } =20 =20 --=20 2.31.1