From nobody Sun Feb 8 18:57:19 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=1628683864; cv=none; d=zohomail.com; s=zohoarc; b=aVtxZGoW5hEnKpS9iy3ej1C3+SCAFaJPIbTGa4r/oObGQICtgQEIjy+Hg/rlQnGXNDWY/ZQPwmouneuVaTWJ8QDOgjpfux+s1IIplrSJrUWGxS/pUJA5J6uH/+Dis9RSZDigp3o/zfWSsVMuPNfRzmdAiV4H7j11A7mfRK/0bHk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1628683864; 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=hjokGuFj61jCdv6/KaGioBvywSu3rmMZA5pjYmT+feU=; b=MiJVPreAYc6Ag6cDkp4DVZ5TKPzuX3xIUKD9AKEOOM5aFR4hdVf4t+s9ZOCIe+gnBm50CoACo1pScPJ2DKFDBD0fgjcYDyiR4WDBcNYlcLLeB6yS0hRuzuuUD43A1RlvhfLVUhX2dgK33F7JYs1nFelXog4UoX5iMnPRc3RVfXc= 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 1628683864548442.84675982252725; Wed, 11 Aug 2021 05:11:04 -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-212-AnF_A51WPbCcidRzOmmkFw-1; Wed, 11 Aug 2021 08:11:01 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5327D101C8C3; Wed, 11 Aug 2021 12:10:56 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 221BC2B3DB; Wed, 11 Aug 2021 12:10:56 +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 D124C181A2A6; Wed, 11 Aug 2021 12:10:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17BC7ZeO009390 for ; Wed, 11 Aug 2021 08:07:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id 261DF171FF; Wed, 11 Aug 2021 12:07:35 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id A1BEC5C1B4 for ; Wed, 11 Aug 2021 12:07:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1628683863; 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=hjokGuFj61jCdv6/KaGioBvywSu3rmMZA5pjYmT+feU=; b=VuegKLFD62/24eKM70M4SULM8cb+AQbY5dDhDBFgLBFvKG01as9voZYuri5EW3+O132LfF xVkG9wu+j6WQDKrnIY9Le+2m0+Q5zLrVkMzo4GsqLr8q9vNAl9+eiQ5haOx1NttLEr8R9t NPPFhwHp+PfdBG4oNi9yDc8kTeprQb0= X-MC-Unique: AnF_A51WPbCcidRzOmmkFw-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 2/3] util: xml: use g_auto for xmlXPathObject Date: Wed, 11 Aug 2021 14:07:26 +0200 Message-Id: <8857a3c4cbbd72c30fc033077fac48b3f9a00e66.1628683625.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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.23 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: 1628683865352100001 Signed-off-by: J=C3=A1n Tomko --- src/util/virxml.c | 36 ++++++++++-------------------------- 1 file changed, 10 insertions(+), 26 deletions(-) diff --git a/src/util/virxml.c b/src/util/virxml.c index 4360b15486..6b5ed08426 100644 --- a/src/util/virxml.c +++ b/src/util/virxml.c @@ -72,7 +72,7 @@ char * virXPathString(const char *xpath, xmlXPathContextPtr ctxt) { - xmlXPathObjectPtr obj; + g_autoptr(xmlXPathObject) obj =3D NULL; char *ret; =20 if ((ctxt =3D=3D NULL) || (xpath =3D=3D NULL)) { @@ -83,11 +83,9 @@ virXPathString(const char *xpath, obj =3D xmlXPathEval(BAD_CAST xpath, ctxt); if ((obj =3D=3D NULL) || (obj->type !=3D XPATH_STRING) || (obj->stringval =3D=3D NULL) || (obj->stringval[0] =3D=3D 0)) { - xmlXPathFreeObject(obj); return NULL; } ret =3D g_strdup((char *)obj->stringval); - xmlXPathFreeObject(obj); return ret; } =20 @@ -147,7 +145,7 @@ virXPathNumber(const char *xpath, xmlXPathContextPtr ctxt, double *value) { - xmlXPathObjectPtr obj; + g_autoptr(xmlXPathObject) obj =3D NULL; =20 if ((ctxt =3D=3D NULL) || (xpath =3D=3D NULL) || (value =3D=3D NULL)) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -157,12 +155,10 @@ virXPathNumber(const char *xpath, obj =3D xmlXPathEval(BAD_CAST xpath, ctxt); if ((obj =3D=3D NULL) || (obj->type !=3D XPATH_NUMBER) || (isnan(obj->floatval))) { - xmlXPathFreeObject(obj); return -1; } =20 *value =3D obj->floatval; - xmlXPathFreeObject(obj); return 0; } =20 @@ -172,7 +168,7 @@ virXPathLongBase(const char *xpath, int base, long *value) { - xmlXPathObjectPtr obj; + g_autoptr(xmlXPathObject) obj =3D NULL; int ret =3D 0; =20 if ((ctxt =3D=3D NULL) || (xpath =3D=3D NULL) || (value =3D=3D NULL)) { @@ -194,7 +190,6 @@ virXPathLongBase(const char *xpath, ret =3D -1; } =20 - xmlXPathFreeObject(obj); return ret; } =20 @@ -274,7 +269,7 @@ virXPathULongBase(const char *xpath, int base, unsigned long *value) { - xmlXPathObjectPtr obj; + g_autoptr(xmlXPathObject) obj =3D NULL; int ret =3D 0; =20 if ((ctxt =3D=3D NULL) || (xpath =3D=3D NULL) || (value =3D=3D NULL)) { @@ -296,7 +291,6 @@ virXPathULongBase(const char *xpath, ret =3D -1; } =20 - xmlXPathFreeObject(obj); return ret; } =20 @@ -387,7 +381,7 @@ virXPathULongLong(const char *xpath, xmlXPathContextPtr ctxt, unsigned long long *value) { - xmlXPathObjectPtr obj; + g_autoptr(xmlXPathObject) obj =3D NULL; int ret =3D 0; =20 if ((ctxt =3D=3D NULL) || (xpath =3D=3D NULL) || (value =3D=3D NULL)) { @@ -409,7 +403,6 @@ virXPathULongLong(const char *xpath, ret =3D -1; } =20 - xmlXPathFreeObject(obj); return ret; } =20 @@ -430,7 +423,7 @@ virXPathLongLong(const char *xpath, xmlXPathContextPtr ctxt, long long *value) { - xmlXPathObjectPtr obj; + g_autoptr(xmlXPathObject) obj =3D NULL; int ret =3D 0; =20 if ((ctxt =3D=3D NULL) || (xpath =3D=3D NULL) || (value =3D=3D NULL)) { @@ -452,7 +445,6 @@ virXPathLongLong(const char *xpath, ret =3D -1; } =20 - xmlXPathFreeObject(obj); return ret; } =20 @@ -894,7 +886,7 @@ int virXPathBoolean(const char *xpath, xmlXPathContextPtr ctxt) { - xmlXPathObjectPtr obj; + g_autoptr(xmlXPathObject) obj =3D NULL; int ret; =20 if ((ctxt =3D=3D NULL) || (xpath =3D=3D NULL)) { @@ -905,12 +897,10 @@ virXPathBoolean(const char *xpath, obj =3D xmlXPathEval(BAD_CAST xpath, ctxt); if ((obj =3D=3D NULL) || (obj->type !=3D XPATH_BOOLEAN) || (obj->boolval < 0) || (obj->boolval > 1)) { - xmlXPathFreeObject(obj); return -1; } ret =3D obj->boolval; =20 - xmlXPathFreeObject(obj); return ret; } =20 @@ -928,7 +918,7 @@ xmlNodePtr virXPathNode(const char *xpath, xmlXPathContextPtr ctxt) { - xmlXPathObjectPtr obj; + g_autoptr(xmlXPathObject) obj =3D NULL; xmlNodePtr ret; =20 if ((ctxt =3D=3D NULL) || (xpath =3D=3D NULL)) { @@ -940,12 +930,10 @@ virXPathNode(const char *xpath, if ((obj =3D=3D NULL) || (obj->type !=3D XPATH_NODESET) || (obj->nodesetval =3D=3D NULL) || (obj->nodesetval->nodeNr <=3D 0) = || (obj->nodesetval->nodeTab =3D=3D NULL)) { - xmlXPathFreeObject(obj); return NULL; } =20 ret =3D obj->nodesetval->nodeTab[0]; - xmlXPathFreeObject(obj); return ret; } =20 @@ -965,7 +953,7 @@ virXPathNodeSet(const char *xpath, xmlXPathContextPtr ctxt, xmlNodePtr **list) { - xmlXPathObjectPtr obj; + g_autoptr(xmlXPathObject) obj =3D NULL; int ret; =20 if ((ctxt =3D=3D NULL) || (xpath =3D=3D NULL)) { @@ -984,21 +972,17 @@ virXPathNodeSet(const char *xpath, if (obj->type !=3D XPATH_NODESET) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Incorrect xpath '%s'"), xpath); - xmlXPathFreeObject(obj); return -1; } =20 - if ((obj->nodesetval =3D=3D NULL) || (obj->nodesetval->nodeNr < 0)) { - xmlXPathFreeObject(obj); + if ((obj->nodesetval =3D=3D NULL) || (obj->nodesetval->nodeNr < 0)) return 0; - } =20 ret =3D obj->nodesetval->nodeNr; if (list !=3D NULL && ret) { *list =3D g_new0(xmlNodePtr, ret); memcpy(*list, obj->nodesetval->nodeTab, ret * sizeof(xmlNodePtr)); } - xmlXPathFreeObject(obj); return ret; } =20 --=20 2.31.1