From: Jim Meyering <meyering@redhat.com>
Date: Thu, 25 Mar 2010 20:53:29 +0000 (+0100)
Subject: tests: teach syntax-check that virDomainDefFree has free-like semantics
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=156133597dee6e79768c267b2fb4b5ebff5998f0;p=libvirt.git

tests: teach syntax-check that virDomainDefFree has free-like semantics

* cfg.mk (useless_free_options): Add virDomainDefFree to the list
of free-like functions.
* src/test/test_driver.c (testDomainCreateXML): Remove useless-if-
before-virDomainDefFree.
* src/conf/domain_conf.c (virDomainAssignDef): Likewise
---

diff --git a/cfg.mk b/cfg.mk
index 4302338cc8..bf5eae3093 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -64,6 +64,7 @@ useless_free_options =		\
   --name=VIR_FREE		\
   --name=xmlFree		\
   --name=xmlXPathFreeContext	\
+  --name=virDomainDefFree	\
   --name=xmlXPathFreeObject
 
 # Avoid uses of write(2).  Either switch to streams (fwrite), or use
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 22e1679226..55198343ed 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -759,8 +759,7 @@ virDomainObjPtr virDomainAssignDef(virCapsPtr caps,
             virDomainDefFree(domain->def);
             domain->def = def;
         } else {
-            if (domain->newDef)
-                virDomainDefFree(domain->newDef);
+            virDomainDefFree(domain->newDef);
             domain->newDef = def;
         }
 
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index f54ebaef20..fb5c3f6bda 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -1328,8 +1328,7 @@ cleanup:
         virDomainObjUnlock(dom);
     if (event)
         testDomainEventQueue(privconn, event);
-    if (def)
-        virDomainDefFree(def);
+    virDomainDefFree(def);
     testDriverUnlock(privconn);
     return ret;
 }