From 7e1667d76e76eb3d571be5e4b545e8ace6e92187 Mon Sep 17 00:00:00 2001 From: Serge Hallyn Date: Mon, 22 Apr 2013 15:40:57 -0500 Subject: [PATCH] cgpath test: don't check path len before checking if it is null Signed-off-by: Serge Hallyn --- src/tests/cgpath.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/tests/cgpath.c b/src/tests/cgpath.c index f05c43592..de2d13bb3 100644 --- a/src/tests/cgpath.c +++ b/src/tests/cgpath.c @@ -63,8 +63,7 @@ int main() free(path); path = lxc_cgroup_path_create("ab", MYNAME); - len = strlen(path); - if (!path || !len) { + if (!path || !(len = strlen(path))) { TSTERR("zero result from lxc_cgroup_path_create"); exit(1); } @@ -89,7 +88,7 @@ int main() c->set_config_item(c, "lxc.network.type", "empty"); if (!c->createl(c, "ubuntu", NULL)) { TSTERR("creating first container"); - exit(1); + goto out; } c->load_config(c, NULL); c->want_daemonize(c); @@ -141,7 +140,7 @@ int main() const char *dirpath; if (lxc_get_cgpath(&dirpath, NULL, c2->name, c2->config_path) < 0) { TSTERR("getting second container's cgpath"); - return -1; + goto out; } if (lxc_cgroup_nrtasks(dirpath) < 1) { -- 2.47.2