summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-09-03 11:22:19 +0200
committerLennart Poettering <lennart@poettering.net>2015-09-03 11:22:19 +0200
commit78fc2ed383327d7d380de32e774c5f1a2c48d893 (patch)
tree9f25e978b511e294c9f55dd6c0d9ed4c99e1459d
parentf0ff5bb88ca8ebfe07d986c51d3a6dba667db908 (diff)
parent99d3888a1996e100f6bf57dd3281bbb8947da53d (diff)
Merge pull request #1134 from reverendhomer/patch-1
cgroup-util: Removed unreachable statement in cg_get_path
-rw-r--r--src/basic/cgroup-util.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index 4fcff87dfa..0ebe570bb8 100644
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -540,10 +540,7 @@ int cg_get_path(const char *controller, const char *path, const char *suffix, ch
else {
const char *dn;
- if (controller)
- dn = controller_to_dirname(controller);
- else
- dn = NULL;
+ dn = controller_to_dirname(controller);
r = join_path_legacy(dn, path, suffix, fs);
}