>From 1bf72a21c57cd3ab439d7337f7b13840cedcee5e Mon Sep 17 00:00:00 2001
From: Laine Stump <laine@laine.org>
Date: Tue, 14 Jun 2011 20:08:53 -0400
Subject: [PATCH] squash into txt record 1/5

---
 docs/formatnetwork.html.in  |    4 ++--
 src/conf/network_conf.c     |    4 +++-
 src/network/bridge_driver.c |    1 +
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in
index 1cf7636..62e1e08 100644
--- a/docs/formatnetwork.html.in
+++ b/docs/formatnetwork.html.in
@@ -183,8 +183,8 @@
       or commas. value is a single string that can contain multiple values
       separated by commas. <span class="since">Since 0.9.3</span>
       </dd>
-
-      </dd><dt><code>dhcp</code></dt><dd>Also within the <code>ip</code> element there is an
+      <dt><code>dhcp</code></dt>
+      <dd>Also within the <code>ip</code> element there is an
         optional <code>dhcp</code> element. The presence of this element
         enables DHCP services on the virtual network. It will further
         contain one or more <code>range</code> elements. The
diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
index 93e931f..d8f1e25 100644
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -460,7 +460,7 @@ virNetworkDNSDefParseXML(virNetworkDNSDefPtr *dnsdef,
     char *value = NULL;
     virNetworkDNSDefPtr def = NULL;
 
-    if (VIR_ALLOC(def)) {
+    if (VIR_ALLOC(def) < 0) {
         virReportOOMError();
         goto error;
     }
@@ -494,6 +494,8 @@ virNetworkDNSDefParseXML(virNetworkDNSDefPtr *dnsdef,
             def->txtrecords[def->ntxtrecords].name = name;
             def->txtrecords[def->ntxtrecords].value = value;
             def->ntxtrecords++;
+            name = NULL;
+            value = NULL;
         }
 
         cur = cur->next;
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 510a38f..dc143db 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -455,6 +455,7 @@ networkSaveDnsmasqHostsfile(virNetworkIpDefPtr ipdef,
     return 0;
 }
 
+
 static int
 networkBuildDnsmasqArgv(virNetworkObjPtr network,
                         virNetworkIpDefPtr ipdef,
-- 
1.7.3.4