[PATCH 1/5] virNetworkDNSHostDefParseXML: Refactor parsing
Use 'virXMLNodeGetSubelementList' instead of looping through XML nodes
and modernize the code.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/conf/network_conf.c | 94 ++++++++++++++++++++---------------------
1 file changed, 46 insertions(+), 48 deletions(-)
diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
index e4c8c5fd4d..9dd6fb4ce9 100644
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -656,63 +656,61 @@ virNetworkDNSHostDefParseXML(const char *networkName,
virNetworkDNSHostDef *def,
bool partialOkay)
{
- xmlNodePtr cur;
- g_autofree char *ip = NULL;
-
- if (!(ip = virXMLPropString(node, "ip")) && !partialOkay) {
- virReportError(VIR_ERR_XML_DETAIL,
- _("Missing IP address in network '%1$s' DNS HOST
record"),
- networkName);
- goto error;
- }
-
- if (ip && (virSocketAddrParse(&def->ip, ip, AF_UNSPEC) < 0)) {
- virReportError(VIR_ERR_XML_DETAIL,
- _("Invalid IP address in network '%1$s' DNS HOST
record"),
- networkName);
- goto error;
- }
+ g_autofree xmlNodePtr *hostnameNodes = NULL;
+ size_t nhostnameNodes = virXMLNodeGetSubelementList(node, "hostname",
&hostnameNodes);
+ size_t i;
+ g_auto(GStrv) hostnames = NULL;
+ g_autofree char *ip = virXMLPropString(node, "ip");
- cur = node->children;
- while (cur != NULL) {
- if (cur->type == XML_ELEMENT_NODE &&
- virXMLNodeNameEqual(cur, "hostname")) {
- if (cur->children != NULL) {
- g_autofree char *name = virXMLNodeContentString(cur);
+ if (nhostnameNodes > 0) {
+ hostnames = g_new0(char *, nhostnameNodes + 1);
- if (!name)
- goto error;
+ for (i = 0; i < nhostnameNodes; i++) {
+ if (!(hostnames[i] = virXMLNodeContentString(hostnameNodes[i])))
+ return -1;
- if (!name[0]) {
- virReportError(VIR_ERR_XML_DETAIL,
- _("Missing hostname in network '%1$s'
DNS HOST record"),
- networkName);
- goto error;
- }
- VIR_APPEND_ELEMENT(def->names, def->nnames, name);
- }
+ if (*hostnames[i] == '\0') {
+ virReportError(VIR_ERR_XML_DETAIL,
+ _("Missing hostname in network '%1$s' DNS
HOST record"),
+ networkName);
+ return -1;
+ }
+ }
+ } else {
+ if (!partialOkay) {
+ virReportError(VIR_ERR_XML_DETAIL,
+ _("Missing hostname in network '%1$s' DNS HOST
record"),
+ networkName);
+ return -1;
}
- cur = cur->next;
- }
- if (def->nnames == 0 && !partialOkay) {
- virReportError(VIR_ERR_XML_DETAIL,
- _("Missing hostname in network '%1$s' DNS HOST
record"),
- networkName);
- goto error;
}
- if (!VIR_SOCKET_ADDR_VALID(&def->ip) && def->nnames == 0) {
- virReportError(VIR_ERR_XML_DETAIL,
- _("Missing ip and hostname in network '%1$s' DNS HOST
record"),
- networkName);
- goto error;
+ if (ip) {
+ if (virSocketAddrParse(&def->ip, ip, AF_UNSPEC) < 0) {
+ virReportError(VIR_ERR_XML_DETAIL,
+ _("Invalid IP address in network '%1$s' DNS HOST
record"),
+ networkName);
+ return -1;
+ }
+ } else {
+ if (!partialOkay) {
+ virReportError(VIR_ERR_XML_DETAIL,
+ _("Missing IP address in network '%1$s' DNS HOST
record"),
+ networkName);
+ return -1;
+ }
+
+ if (nhostnameNodes == 0) {
+ virReportError(VIR_ERR_XML_DETAIL,
+ _("Missing ip and hostname in network '%1$s' DNS
HOST record"),
+ networkName);
+ return -1;
+ }
}
+ def->names = g_steal_pointer(&hostnames);
+ def->nnames = nhostnameNodes;
return 0;
-
- error:
- virNetworkDNSHostDefClear(def);
- return -1;
}
--
2.41.0