From: 2xsec <dh48.jeong@samsung.com>
Date: Tue, 3 Jul 2018 09:25:02 +0000 (+0900)
Subject: tests: cleanup shutdowntest.c
X-Git-Tag: lxc-3.1.0~221^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70b12b4a839d80d26bc84e9b0e236735c377ed2f;p=thirdparty%2Flxc.git

tests: cleanup shutdowntest.c

Signed-off-by: 2xsec <dh48.jeong@samsung.com>
---

diff --git a/src/tests/shutdowntest.c b/src/tests/shutdowntest.c
index 00b18a45f..cec6efc7b 100644
--- a/src/tests/shutdowntest.c
+++ b/src/tests/shutdowntest.c
@@ -49,8 +49,10 @@ int main(int argc, char *argv[])
 		fprintf(stderr, "%d: failed to set network type\n", __LINE__);
 		goto out;
 	}
+
 	c->set_config_item(c, "lxc.net.0.link", "lxcbr0");
 	c->set_config_item(c, "lxc.net.0.flags", "up");
+
 	if (!c->createl(c, "busybox", NULL, NULL, 0, NULL)) {
 		fprintf(stderr, "%d: failed to create a container\n", __LINE__);
 		goto out;
@@ -64,6 +66,7 @@ int main(int argc, char *argv[])
 	c->clear_config(c);
 	c->load_config(c, NULL);
 	c->want_daemonize(c, true);
+
 	if (!c->startl(c, 0, NULL)) {
 		fprintf(stderr, "%d: failed to start %s\n", __LINE__, MYNAME);
 		goto out;
@@ -74,9 +77,9 @@ int main(int argc, char *argv[])
 
 	if (!c->shutdown(c, 120)) {
 		fprintf(stderr, "%d: failed to shut down %s\n", __LINE__, MYNAME);
-		if (!c->stop(c)) {
+		if (!c->stop(c))
 			fprintf(stderr, "%d: failed to kill %s\n", __LINE__, MYNAME);
-		}
+
 		goto out;
 	}
 
@@ -92,10 +95,10 @@ int main(int argc, char *argv[])
 
 	fprintf(stderr, "all lxc_container tests passed for %s\n", c->name);
 	ret = 0;
+
 out:
-	if (c && c->is_defined(c)) {
+	if (c && c->is_defined(c))
 		c->destroy(c);
-	}
 
 	lxc_container_put(c);
 	exit(ret);