From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 24 Jan 2015 19:38:49 +0000 (+0100)
Subject: Bug #158: Deletion of unnecessary checks before a few calls of LXC functions
X-Git-Tag: lxc-1.0.8~72
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=284369c971b5bfa8083da9173435c418151ac8c2;p=thirdparty%2Flxc.git

Bug #158: Deletion of unnecessary checks before a few calls of LXC functions

The following functions return immediately if a null pointer was passed.
* container_destroy
* lxc_cgroup_process_info_free_and_remove
* lxc_cgroup_put_meta
* toss_list

It is therefore not needed that a function caller repeats a corresponding check.

This issue was fixed by using the software Coccinelle 1.0.0-rc23.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
---

diff --git a/src/lxc/cgfs.c b/src/lxc/cgfs.c
index 413f29b46..a3adc37f6 100644
--- a/src/lxc/cgfs.c
+++ b/src/lxc/cgfs.c
@@ -2248,10 +2248,8 @@ static void cgfs_destroy(void *hdata)
 	if (!d)
 		return;
 	free(d->name);
-	if (d->info)
-		lxc_cgroup_process_info_free_and_remove(d->info);
-	if (d->meta)
-		lxc_cgroup_put_meta(d->meta);
+	lxc_cgroup_process_info_free_and_remove(d->info);
+	lxc_cgroup_put_meta(d->meta);
 	free(d);
 }
 
diff --git a/src/lxc/lxc_autostart.c b/src/lxc/lxc_autostart.c
index 1472efbf2..a239cf7aa 100644
--- a/src/lxc/lxc_autostart.c
+++ b/src/lxc/lxc_autostart.c
@@ -482,7 +482,7 @@ int main(int argc, char *argv[])
 			if ( lxc_container_put(c) > 0 ) {
 				containers[i] = NULL;
 			}
-			if ( c_groups_lists && c_groups_lists[i] ) {
+			if ( c_groups_lists ) {
 				toss_list(c_groups_lists[i]);
 				c_groups_lists[i] = NULL;
 			}
@@ -500,11 +500,7 @@ int main(int argc, char *argv[])
 	}
 
 	free(c_groups_lists);
-
-	if ( cmd_groups_list ) {
-		toss_list( cmd_groups_list );
-	}
-
+	toss_list( cmd_groups_list );
 	free(containers);
 
 	return 0;
diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index 794e62c5d..8bd3d5c48 100644
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -1370,7 +1370,7 @@ out_unlock:
 	if (partial_fd >= 0)
 		remove_partial(c, partial_fd);
 out:
-	if (!ret && c)
+	if (!ret)
 		lxcapi_destroy(c);
 free_tpath:
 	free(tpath);