NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

util: replace all calls to xmlNodeGetContent with virXMLNodeContentString

Browse Source 
No functional change

Signed-off-by: Laine Stump <laine@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Laine Stump 2020-07-14 00:21:28 -04:00
parent b595f44525
commit c42e161000
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/conf/domain_conf.c
View File

@ -1650,7 +1650,7 @@ virDomainBlkioDeviceParseXML(xmlNodePtr root,
if (node->type != XML_ELEMENT_NODE) if (node->type != XML_ELEMENT_NODE)
continue; continue;
c = (char *)xmlNodeGetContent(node); c = virXMLNodeContentString(node);
if (virXMLNodeNameEqual(node, "path")) { if (virXMLNodeNameEqual(node, "path")) {
/* To avoid the need for explicit cleanup on failure, /* To avoid the need for explicit cleanup on failure,
@ -9377,10 +9377,10 @@ virDomainLeaseDefParseXML(xmlNodePtr node)
while (cur != NULL) { while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE) { if (cur->type == XML_ELEMENT_NODE) {
if (!key && virXMLNodeNameEqual(cur, "key")) { if (!key && virXMLNodeNameEqual(cur, "key")) {
key = (char *)xmlNodeGetContent(cur); key = virXMLNodeContentString(cur);
} else if (!lockspace && } else if (!lockspace &&
virXMLNodeNameEqual(cur, "lockspace")) { virXMLNodeNameEqual(cur, "lockspace")) {
lockspace = (char *)xmlNodeGetContent(cur); lockspace = virXMLNodeContentString(cur);
} else if (!path && } else if (!path &&
virXMLNodeNameEqual(cur, "target")) { virXMLNodeNameEqual(cur, "target")) {
path = virXMLPropString(cur, "path"); path = virXMLPropString(cur, "path");
@ -10599,16 +10599,16 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
} else if (!serial && } else if (!serial &&
virXMLNodeNameEqual(cur, "serial")) { virXMLNodeNameEqual(cur, "serial")) {
serial = (char *)xmlNodeGetContent(cur); serial = virXMLNodeContentString(cur);
} else if (!wwn && } else if (!wwn &&
virXMLNodeNameEqual(cur, "wwn")) { virXMLNodeNameEqual(cur, "wwn")) {
wwn = (char *)xmlNodeGetContent(cur); wwn = virXMLNodeContentString(cur);
if (!virValidateWWN(wwn)) if (!virValidateWWN(wwn))
goto error; goto error;
} else if (!vendor && } else if (!vendor &&
virXMLNodeNameEqual(cur, "vendor")) { virXMLNodeNameEqual(cur, "vendor")) {
vendor = (char *)xmlNodeGetContent(cur); vendor = virXMLNodeContentString(cur);
if (strlen(vendor) > VENDOR_LEN) { if (strlen(vendor) > VENDOR_LEN) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
@ -10623,7 +10623,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
} }
} else if (!product && } else if (!product &&
virXMLNodeNameEqual(cur, "product")) { virXMLNodeNameEqual(cur, "product")) {
product = (char *)xmlNodeGetContent(cur); product = virXMLNodeContentString(cur);
if (strlen(product) > PRODUCT_LEN) { if (strlen(product) > PRODUCT_LEN) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
@ -13529,7 +13529,7 @@ virDomainSmartcardDefParseXML(virDomainXMLOptionPtr xmlopt,
"exactly three certificates")); "exactly three certificates"));
goto error; goto error;
} }
def->data.cert.file[i] = (char *)xmlNodeGetContent(cur); def->data.cert.file[i] = virXMLNodeContentString(cur);
if (!def->data.cert.file[i]) { if (!def->data.cert.file[i]) {
virReportOOMError(); virReportOOMError();
goto error; goto error;
@ -13538,7 +13538,7 @@ virDomainSmartcardDefParseXML(virDomainXMLOptionPtr xmlopt,
} else if (cur->type == XML_ELEMENT_NODE && } else if (cur->type == XML_ELEMENT_NODE &&
virXMLNodeNameEqual(cur, "database") && virXMLNodeNameEqual(cur, "database") &&
!def->data.cert.database) { !def->data.cert.database) {
def->data.cert.database = (char *)xmlNodeGetContent(cur); def->data.cert.database = virXMLNodeContentString(cur);
if (!def->data.cert.database) { if (!def->data.cert.database) {
virReportOOMError(); virReportOOMError();
goto error; goto error;
@ -19904,7 +19904,7 @@ virDomainLoaderDefParseXML(xmlNodePtr node,
if (!fwAutoSelect) { if (!fwAutoSelect) {
readonly_str = virXMLPropString(node, "readonly"); readonly_str = virXMLPropString(node, "readonly");
type_str = virXMLPropString(node, "type"); type_str = virXMLPropString(node, "type");
loader->path = (char *) xmlNodeGetContent(node); loader->path = virXMLNodeContentString(node);
if (STREQ_NULLABLE(loader->path, "")) if (STREQ_NULLABLE(loader->path, ""))
VIR_FREE(loader->path); VIR_FREE(loader->path);
} }

2
src/conf/network_conf.c
View File

@ -720,7 +720,7 @@ virNetworkDNSHostDefParseXML(const char *networkName,
if (cur->type == XML_ELEMENT_NODE && if (cur->type == XML_ELEMENT_NODE &&
virXMLNodeNameEqual(cur, "hostname")) { virXMLNodeNameEqual(cur, "hostname")) {
if (cur->children != NULL) { if (cur->children != NULL) {
g_autofree char *name = (char *) xmlNodeGetContent(cur); g_autofree char *name = virXMLNodeContentString(cur);
if (!name) { if (!name) {
virReportError(VIR_ERR_XML_DETAIL, virReportError(VIR_ERR_XML_DETAIL,

4
src/conf/node_device_conf.c
View File

@ -1986,10 +1986,10 @@ virNodeDeviceDefParseXML(xmlXPathContextPtr ctxt,
switch ((virNodeDevDevnodeType)val) { switch ((virNodeDevDevnodeType)val) {
case VIR_NODE_DEV_DEVNODE_DEV: case VIR_NODE_DEV_DEVNODE_DEV:
def->devnode = (char*)xmlNodeGetContent(node); def->devnode = virXMLNodeContentString(node);
break; break;
case VIR_NODE_DEV_DEVNODE_LINK: case VIR_NODE_DEV_DEVNODE_LINK:
def->devlinks[m++] = (char*)xmlNodeGetContent(node); def->devlinks[m++] = virXMLNodeContentString(node);
break; break;
case VIR_NODE_DEV_DEVNODE_LAST: case VIR_NODE_DEV_DEVNODE_LAST:
break; break;