From a9aa76bad534816a382202f1d7eee744e40f6c20 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Thu, 5 Feb 2009 16:03:11 +0000
Subject: [PATCH] remove useless code

* src/bridge.c (brAddTap): Remove redundant errno=ENOMEM assignment
after failed strdup.
* src/cgroup.c (virCgroupFree): Remove redundant *group=NULL assignment
after VIR_FREE(*group).
* src/lxc_driver.c (lxcShutdown): Likewise.
* src/xen_unified.c (xenUnifiedClose): Likewise.
* src/xm_internal.c (xenXMDomainConfigFormat): Rewrite disk-
and net-config-setting code to be clearer.
---
 ChangeLog         | 12 ++++++++++++
 src/bridge.c      |  6 ++----
 src/cgroup.c      |  1 -
 src/lxc_driver.c  |  1 -
 src/xen_unified.c |  1 -
 src/xm_internal.c | 21 ++++++++++-----------
 6 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 207854eab5..b046a774b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Thu Feb 5 17:00:17 +0100 2009 Jim Meyering <meyering@redhat.com>
+
+	remove useless code
+	* src/bridge.c (brAddTap): Remove redundant errno=ENOMEM assignment
+	after failed strdup.
+	* src/cgroup.c (virCgroupFree): Remove redundant *group=NULL assignment
+	after VIR_FREE(*group).
+	* src/lxc_driver.c (lxcShutdown): Likewise.
+	* src/xen_unified.c (xenUnifiedClose): Likewise.
+	* src/xm_internal.c (xenXMDomainConfigFormat): Rewrite disk-
+	and net-config-setting code to be clearer.
+
 Wed Feb 4 22:22:34 +0100 2009 Jim Meyering <meyering@redhat.com>
 
 	lxc_container: Don't dereference NULL upon failure
diff --git a/src/bridge.c b/src/bridge.c
index 9c4ca7422a..990a5679d3 100644
--- a/src/bridge.c
+++ b/src/bridge.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 Red Hat, Inc.
+ * Copyright (C) 2007, 2009 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -539,10 +539,8 @@ brAddTap(brControl *ctl,
             if ((errno = brSetInterfaceUp(ctl, try.ifr_name, 1)))
                 goto error;
             VIR_FREE(*ifname);
-            if (!(*ifname = strdup(try.ifr_name))) {
-                errno = ENOMEM;
+            if (!(*ifname = strdup(try.ifr_name)))
                 goto error;
-            }
             *tapfd = fd;
             return 0;
         }
diff --git a/src/cgroup.c b/src/cgroup.c
index 1b4c27f778..8bd6e87309 100644
--- a/src/cgroup.c
+++ b/src/cgroup.c
@@ -51,7 +51,6 @@ void virCgroupFree(virCgroupPtr *group)
     if (*group != NULL) {
         VIR_FREE((*group)->path);
         VIR_FREE(*group);
-        *group = NULL;
     }
 }
 
diff --git a/src/lxc_driver.c b/src/lxc_driver.c
index 87865053ff..aa417a91fa 100644
--- a/src/lxc_driver.c
+++ b/src/lxc_driver.c
@@ -1238,7 +1238,6 @@ static int lxcShutdown(void)
     lxcDriverUnlock(lxc_driver);
     virMutexDestroy(&lxc_driver->lock);
     VIR_FREE(lxc_driver);
-    lxc_driver = NULL;
 
     return 0;
 }
diff --git a/src/xen_unified.c b/src/xen_unified.c
index eefdb6c15c..8e64f51118 100644
--- a/src/xen_unified.c
+++ b/src/xen_unified.c
@@ -399,7 +399,6 @@ xenUnifiedClose (virConnectPtr conn)
 
     virMutexDestroy(&priv->lock);
     VIR_FREE(conn->privateData);
-    conn->privateData = NULL;
 
     return 0;
 }
diff --git a/src/xm_internal.c b/src/xm_internal.c
index a03263c40f..3a96058d72 100644
--- a/src/xm_internal.c
+++ b/src/xm_internal.c
@@ -2233,14 +2233,13 @@ virConfPtr xenXMDomainConfigFormat(virConnectPtr conn,
                                         hvm, priv->xendConfigVersion) < 0)
             goto cleanup;
     }
-    if (diskVal->list == NULL)
-        VIR_FREE(diskVal);
-    else if (virConfSetValue(conf, "disk", diskVal) < 0) {
+    if (diskVal->list != NULL) {
+        int ret = virConfSetValue(conf, "disk", diskVal);
         diskVal = NULL;
-        goto no_memory;
+        if (ret < 0)
+            goto no_memory;
     }
-    diskVal = NULL;
-
+    VIR_FREE(diskVal);
 
     if (VIR_ALLOC(netVal) < 0)
         goto no_memory;
@@ -2253,13 +2252,13 @@ virConfPtr xenXMDomainConfigFormat(virConnectPtr conn,
                                        hvm) < 0)
             goto cleanup;
     }
-    if (netVal->list == NULL)
-        VIR_FREE(netVal);
-    else if (virConfSetValue(conf, "vif", netVal) < 0) {
+    if (netVal->list != NULL) {
+        int ret = virConfSetValue(conf, "vif", netVal);
         netVal = NULL;
-        goto no_memory;
+        if (ret < 0)
+            goto no_memory;
     }
-    netVal = NULL;
+    VIR_FREE(netVal);
 
     if (hvm) {
         if (def->nparallels) {