Avoid compile warnings about assignment/conditional/truthvalue

diff --git a/ChangeLog b/ChangeLog
index 2dfcadeef3e1e712d1a6b01c8792adae66b6c47d..7c54074a9fc9662e4216fecfd64008bfb54f7c19 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Apr 22 15:28:03 BST 2009 Daniel P. Berrange <berrange@redhat.com>
+
+       * src/network_driver.c: Explicit check for NULL, to avoid
+       compiler complaining about "assignment treated as truth value
+       in conditional".
+
 Wed Apr 22 15:27:03 BST 2009 Daniel P. Berrange <berrange@redhat.com>
 
        Use private /dev/pts instance for containers (needs 'newinstance'

diff --git a/src/network_conf.c b/src/network_conf.c
index e962c1ad4d462fa4c35692aeb0527258d50680c1..b4da3fb090d03bd19e4fa28903124536b1ccb972 100644 (file)
--- a/src/network_conf.c
+++ b/src/network_conf.c
@@ -748,7 +748,7 @@ virNetworkObjPtr virNetworkLoadConfig(virConnectPtr conn,
     /* Generate a bridge if none is found, but don't check for collisions
      * if a bridge is hardcoded, so the network is at least defined
      */
-    if (tmp = virNetworkAllocateBridge(conn, nets, def->bridge)) {
+    if ((tmp = virNetworkAllocateBridge(conn, nets, def->bridge)) != NULL) {
         VIR_FREE(def->bridge);
         def->bridge = tmp;
     } else