From nobody Sun Feb 8 19:24:55 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=1628757558; cv=none; d=zohomail.com; s=zohoarc; b=kf4rBWGUVZdik6lpYVp0yn+GyaYJmeQGHt0wmbCRcYUjm/yfynVbT3vsDN7F/01aN2ZZ533sZ2//88i1h3gNmuQ6/IHnB6ywgTJZCLv6y3XnnAwmW0aroijZU1UsTaVp5j0mpXKlB612btWOLYctd9xtSR4mbJ4OTrsUNsJ53xM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1628757558; 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=37RhxAwjmQmY2cqu6tkIDyyZmLUUmqTCNix1t0fqUSc=; b=hziAs89cB/hSlme6A2ceddpHYpFm30boXsn8smejPkIehWYKkY7sFs5IcFHQviHUCvWQ/++NGYDHFV80EDgs+QKDzS7gj3KPRksQ9bdTgGGo2xW1Yj9u4pS0LS/bO8SlZW/4yR0BiQ3EYrrFb9r5jiVPCLQcX8/CQwULMAJ0ZPk= 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 1628757558979280.6253009211234; Thu, 12 Aug 2021 01:39:18 -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-444-k6I5rP1pNS2GRj41GgQRXQ-1; Thu, 12 Aug 2021 04:39:15 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 249EE760C6; Thu, 12 Aug 2021 08:39: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 0BBE519CBA; Thu, 12 Aug 2021 08:39: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 C75F2181A0F7; Thu, 12 Aug 2021 08:39:09 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17C8X9gs003663 for ; Thu, 12 Aug 2021 04:33:09 -0400 Received: by smtp.corp.redhat.com (Postfix) id 53EA610372C0; Thu, 12 Aug 2021 08:33:09 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id D097A10013C1 for ; Thu, 12 Aug 2021 08:33:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1628757558; 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=37RhxAwjmQmY2cqu6tkIDyyZmLUUmqTCNix1t0fqUSc=; b=QERxUTL0efDft77ZECS4ul5StAJqgfOBTVKBZvAIAWdfa2Ha9vOST7o/TtBtz/GBZ1anJw Gpowev0Blk1SqyZDPpxL0HluZK3nvtRcAx5tfeJ62cRQqh/y2k4ykz0YBGBWbFdUwtPxzA ZurydghNXLNVyBh0eHv7yusCjFUoT2A= X-MC-Unique: k6I5rP1pNS2GRj41GgQRXQ-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 06/12] tools: virsh: use automatic cleanup for xmlXPathObject Date: Thu, 12 Aug 2021 10:32:44 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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.11 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: 1628757560453100001 Signed-off-by: J=C3=A1n Tomko --- tools/virsh-domain.c | 9 +++------ tools/virsh-volume.c | 3 +-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 398190bb5b..0c60a4de99 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -3066,7 +3066,7 @@ cmdDomIfSetLink(vshControl *ctl, const vshCmd *cmd) size_t i; xmlDocPtr xml =3D NULL; g_autoptr(xmlXPathContext) ctxt =3D NULL; - xmlXPathObjectPtr obj =3D NULL; + g_autoptr(xmlXPathObject) obj =3D NULL; xmlNodePtr cur =3D NULL; char *xml_buf =3D NULL; =20 @@ -3178,7 +3178,6 @@ cmdDomIfSetLink(vshControl *ctl, const vshCmd *cmd) } =20 cleanup: - xmlXPathFreeObject(obj); xmlFreeDoc(xml); VIR_FREE(xml_buf); =20 @@ -12070,7 +12069,7 @@ virshDomainDetachInterface(char *doc, const char *mac) { xmlDocPtr xml =3D NULL; - xmlXPathObjectPtr obj =3D NULL; + g_autoptr(xmlXPathObject) obj =3D NULL; g_autoptr(xmlXPathContext) ctxt =3D NULL; xmlNodePtr cur =3D NULL, matchNode =3D NULL; char *detach_xml =3D NULL; @@ -12145,7 +12144,6 @@ virshDomainDetachInterface(char *doc, cleanup: VIR_FREE(detach_xml); xmlFreeDoc(xml); - xmlXPathFreeObject(obj); return ret =3D=3D 0; } =20 @@ -12250,7 +12248,7 @@ virshFindDisk(const char *doc, int type) { xmlDocPtr xml =3D NULL; - xmlXPathObjectPtr obj =3D NULL; + g_autoptr(xmlXPathObject) obj =3D NULL; g_autoptr(xmlXPathContext) ctxt =3D NULL; xmlNodePtr cur =3D NULL; xmlNodePtr ret =3D NULL; @@ -12325,7 +12323,6 @@ virshFindDisk(const char *doc, vshError(NULL, _("No disk found whose source path or target is %s"), p= ath); =20 cleanup: - xmlXPathFreeObject(obj); xmlFreeDoc(xml); return ret; } diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index c9c4310cbd..4b179d7d87 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -527,7 +527,7 @@ virshMakeCloneXML(const char *origxml, const char *newn= ame) { xmlDocPtr doc =3D NULL; g_autoptr(xmlXPathContext) ctxt =3D NULL; - xmlXPathObjectPtr obj =3D NULL; + g_autoptr(xmlXPathObject) obj =3D NULL; xmlChar *newxml =3D NULL; int size; =20 @@ -544,7 +544,6 @@ virshMakeCloneXML(const char *origxml, const char *newn= ame) xmlDocDumpMemory(doc, &newxml, &size); =20 cleanup: - xmlXPathFreeObject(obj); xmlFreeDoc(doc); return newxml; } --=20 2.31.1