From: Laine Stump <laine@laine.org>
Date: Thu, 11 Aug 2011 03:34:07 +0000 (-0400)
Subject: conf: eliminate redundant VIR_ALLOC of 1st element of network DNS hosts.
X-Git-Tag: v0.9.11-rc1~86
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5893b7b64d5f748ec36e52594328beb9bbef099;p=thirdparty%2Flibvirt.git

conf: eliminate redundant VIR_ALLOC of 1st element of network DNS hosts.

virNetworkDNSHostsDefParseXML was calling VIR_ALLOC(def->hosts) if
def->hosts was NULL. This is a waste of time, though, since
VIR_REALLOC_N is called a few lines further down, prior to any use of
def->hosts. (initializing def->nhosts to 0 is also redundant, because
the newly allocated memory will always be cleared to all 0's anyway).
---

diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
index 743ae92937..0333141305 100644
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -510,14 +510,6 @@ virNetworkDNSHostsDefParseXML(virNetworkDNSDefPtr def,
     virSocketAddr inaddr;
     int ret = -1;
 
-    if (def->hosts == NULL) {
-        if (VIR_ALLOC(def->hosts) < 0) {
-            virReportOOMError();
-            goto error;
-        }
-        def->nhosts = 0;
-    }
-
     if (!(ip = virXMLPropString(node, "ip")) ||
         (virSocketAddrParse(&inaddr, ip, AF_UNSPEC) < 0)) {
         virNetworkReportError(VIR_ERR_XML_DETAIL,