Merge pull request #2445 from 2xsec/bugfix

tests: cleanup source codes.

src/tests/api_reboot.c

@@ -59,6 +59,7 @@ int main(int argc, char *argv[])
 		lxc_error("%s\n", "Container \"reboot\" is not defined");
 		goto on_error_put;
 	}
+
 	c->clear_config(c);
 
 	if (!c->load_config(c, NULL)) {
@@ -118,7 +119,9 @@ int main(int argc, char *argv[])
 
 on_error_put:
 	lxc_container_put(c);
+
 	if (ret == EXIT_SUCCESS)
 		lxc_debug("%s\n", "All reboot tests passed");
+
 	exit(ret);
 }

src/tests/clonetest.c

@@ -41,6 +41,7 @@ int main(int argc, char *argv[])
 		lxc_container_put(c);
 		c = NULL;
 	}
+
 	if (c2) {
 		c2->destroy(c2);
 		lxc_container_put(c2);
@@ -52,11 +53,14 @@ int main(int argc, char *argv[])
 		ret = 1;
 		goto out;
 	}
+
 	c->save_config(c, NULL);
+
 	if (!c->createl(c, "busybox", NULL, NULL, 0, NULL)) {
 		fprintf(stderr, "%d: failed to create a container\n", __LINE__);
 		goto out;
 	}
+
 	c->load_config(c, NULL);
 
 	if (!c->is_defined(c)) {
@@ -92,12 +96,14 @@ int main(int argc, char *argv[])
 			c2->destroy(c2);
 		lxc_container_put(c2);
 	}
+
 	c2 = lxc_container_new("clonetest-o1", NULL);
 	if (c2) {
 		if (c2->is_defined(c2))
 			c2->destroy(c2);
 		lxc_container_put(c2);
 	}
+
 	c2 = lxc_container_new("clonetest-o2", NULL);
 	if (c2) {
 		if (c2->is_defined(c2))
@@ -112,6 +118,7 @@ int main(int argc, char *argv[])
 		fprintf(stderr, "failed loading clonetestlvm1\n");
 		goto out;
 	}
+
 	if (!c->is_defined(c)) {
 		fprintf(stderr, "clonetestlvm1 does not exist, skipping lvm tests\n");
 		ret = 0;
@@ -138,6 +145,7 @@ int main(int argc, char *argv[])
 		fprintf(stderr, "lvm clone failed\n");
 		goto out;
 	}
+
 	lxc_container_put(c2);
 	lxc_container_put(c);
 	c = c2 = NULL;
@@ -166,13 +174,16 @@ int main(int argc, char *argv[])
 	if (c3) {
 		lxc_container_put(c3);
 	}
+
 	if (c2) {
 		c2->destroy(c2);
 		lxc_container_put(c2);
 	}
+
 	if (c) {
 		c->destroy(c);
 		lxc_container_put(c);
 	}
+
 	exit(ret);
 }