From nobody Mon Feb 9 06:48:23 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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=1595278150; cv=none; d=zohomail.com; s=zohoarc; b=lj0ZkbAa9aGQQ2bkJgYy+n76zGwvD0kqdkokdycf66SH60TNIUvoMVWVyBAFz/Hqya0SlgIkmitVLOqEw9pzsBajXLFnvk55M6qzNd6smx4+D8NfSGaNNh7HRuhl0RqBnwXFTGbAa/qgM7EkImlYKjldG4/7T47RsTHTOcDvlMk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595278150; 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=dHqWqGOl2Nl0o5cgim+R1zrV1kKyMieYGl8C1tm4NGQ=; b=HHiYgb7IWIs9NTYEGf+G9jKTaVHc+A1NmUHFHALoDY+iKEBnkLXHik8BOggS/V2qz7R0Hsz8qEoVHUYSJExmG5uu15ludk/lrt7qreDMJWUNgGhM7OKnDi1bMp7SqGv83SPLllcsONvgXYybhkUC//kblKHg8Yq/Dl2lXNWwd2k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1595278150396195.66222165632962; Mon, 20 Jul 2020 13:49:10 -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-395-Sf4Llzm5PQOrOS0g_9wvlQ-1; Mon, 20 Jul 2020 16:49:05 -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 0386E100AA25; Mon, 20 Jul 2020 20:48:59 +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 D83717848C; Mon, 20 Jul 2020 20:48:58 +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 8D5039A153; Mon, 20 Jul 2020 20:48:58 +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 06KKmp6r013478 for ; Mon, 20 Jul 2020 16:48:51 -0400 Received: by smtp.corp.redhat.com (Postfix) id 85FA810021B3; Mon, 20 Jul 2020 20:48:51 +0000 (UTC) Received: from vhost2.laine.org (ovpn-112-16.phx2.redhat.com [10.3.112.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3EB551059127 for ; Mon, 20 Jul 2020 20:48:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595278149; 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=dHqWqGOl2Nl0o5cgim+R1zrV1kKyMieYGl8C1tm4NGQ=; b=Ccm5digQMVsflolonjTRg4g0Ai1gEOg3XY+C8hxKZe7X+fGf5lExZ9LtD91ZuR87vv2gu/ CZ3iPHeXA4sExCUKNp1t/i83yirhMrxhMbMiDO3aUhrMSvjdxE/J6kXWQA9NYPfnST4fgh Arx2q/F9jPmF/J7ex1S8zA3sgNMzSbM= X-MC-Unique: Sf4Llzm5PQOrOS0g_9wvlQ-1 From: Laine Stump To: libvir-list@redhat.com Subject: [PATCH 2/5] util: replace all calls to xmlNodeGetContent with virXMLNodeContentString Date: Mon, 20 Jul 2020 16:48:40 -0400 Message-Id: <20200720204843.1245289-3-laine@redhat.com> In-Reply-To: <20200720204843.1245289-1-laine@redhat.com> References: <20200720204843.1245289-1-laine@redhat.com> 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 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" No functional change Signed-off-by: Laine Stump --- src/conf/domain_conf.c | 20 ++++++++++---------- src/conf/network_conf.c | 2 +- src/conf/node_device_conf.c | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ade8c13914..cb69c97a8e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1643,7 +1643,7 @@ virDomainBlkioDeviceParseXML(xmlNodePtr root, if (node->type !=3D XML_ELEMENT_NODE) continue; =20 - c =3D (char *)xmlNodeGetContent(node); + c =3D virXMLNodeContentString(node); =20 if (virXMLNodeNameEqual(node, "path")) { /* To avoid the need for explicit cleanup on failure, @@ -9373,10 +9373,10 @@ virDomainLeaseDefParseXML(xmlNodePtr node) while (cur !=3D NULL) { if (cur->type =3D=3D XML_ELEMENT_NODE) { if (!key && virXMLNodeNameEqual(cur, "key")) { - key =3D (char *)xmlNodeGetContent(cur); + key =3D virXMLNodeContentString(cur); } else if (!lockspace && virXMLNodeNameEqual(cur, "lockspace")) { - lockspace =3D (char *)xmlNodeGetContent(cur); + lockspace =3D virXMLNodeContentString(cur); } else if (!path && virXMLNodeNameEqual(cur, "target")) { path =3D virXMLPropString(cur, "path"); @@ -10595,16 +10595,16 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xm= lopt, =20 } else if (!serial && virXMLNodeNameEqual(cur, "serial")) { - serial =3D (char *)xmlNodeGetContent(cur); + serial =3D virXMLNodeContentString(cur); } else if (!wwn && virXMLNodeNameEqual(cur, "wwn")) { - wwn =3D (char *)xmlNodeGetContent(cur); + wwn =3D virXMLNodeContentString(cur); =20 if (!virValidateWWN(wwn)) goto error; } else if (!vendor && virXMLNodeNameEqual(cur, "vendor")) { - vendor =3D (char *)xmlNodeGetContent(cur); + vendor =3D virXMLNodeContentString(cur); =20 if (strlen(vendor) > VENDOR_LEN) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -10619,7 +10619,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlo= pt, } } else if (!product && virXMLNodeNameEqual(cur, "product")) { - product =3D (char *)xmlNodeGetContent(cur); + product =3D virXMLNodeContentString(cur); =20 if (strlen(product) > PRODUCT_LEN) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -13513,7 +13513,7 @@ virDomainSmartcardDefParseXML(virDomainXMLOptionPtr= xmlopt, "exactly three certificates")); goto error; } - def->data.cert.file[i] =3D (char *)xmlNodeGetContent(cur); + def->data.cert.file[i] =3D virXMLNodeContentString(cur); if (!def->data.cert.file[i]) { virReportOOMError(); goto error; @@ -13522,7 +13522,7 @@ virDomainSmartcardDefParseXML(virDomainXMLOptionPtr= xmlopt, } else if (cur->type =3D=3D XML_ELEMENT_NODE && virXMLNodeNameEqual(cur, "database") && !def->data.cert.database) { - def->data.cert.database =3D (char *)xmlNodeGetContent(cur); + def->data.cert.database =3D virXMLNodeContentString(cur); if (!def->data.cert.database) { virReportOOMError(); goto error; @@ -19875,7 +19875,7 @@ virDomainLoaderDefParseXML(xmlNodePtr node, if (!fwAutoSelect) { readonly_str =3D virXMLPropString(node, "readonly"); type_str =3D virXMLPropString(node, "type"); - loader->path =3D (char *) xmlNodeGetContent(node); + loader->path =3D virXMLNodeContentString(node); if (STREQ_NULLABLE(loader->path, "")) VIR_FREE(loader->path); } diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 0fd68a7d66..0a32f57188 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -720,7 +720,7 @@ virNetworkDNSHostDefParseXML(const char *networkName, if (cur->type =3D=3D XML_ELEMENT_NODE && virXMLNodeNameEqual(cur, "hostname")) { if (cur->children !=3D NULL) { - g_autofree char *name =3D (char *) xmlNodeGetContent(cur= ); + g_autofree char *name =3D virXMLNodeContentString(cur); =20 if (!name) { virReportError(VIR_ERR_XML_DETAIL, diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index c54015336a..7bbe709c5d 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -1988,10 +1988,10 @@ virNodeDeviceDefParseXML(xmlXPathContextPtr ctxt, =20 switch ((virNodeDevDevnodeType)val) { case VIR_NODE_DEV_DEVNODE_DEV: - def->devnode =3D (char*)xmlNodeGetContent(node); + def->devnode =3D virXMLNodeContentString(node); break; case VIR_NODE_DEV_DEVNODE_LINK: - def->devlinks[m++] =3D (char*)xmlNodeGetContent(node); + def->devlinks[m++] =3D virXMLNodeContentString(node); break; case VIR_NODE_DEV_DEVNODE_LAST: break; --=20 2.25.4