X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fcgroup.c;fp=src%2Fcore%2Fcgroup.c;h=5ee5bd79555b36cd10cb6619ba60f8ef6fa9e9ac;hp=a524a411004615d6ba67c3ea51419331a5a3c22f;hb=648294227e8247f729d8cca927d3445ab1836f30;hpb=910c586574a52c6b4cbc6638193797008da076c7

diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index a524a4110..5ee5bd795 100644
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -1203,9 +1203,10 @@ char *unit_default_cgroup_path(Unit *u) {
                 return NULL;
 
         if (slice)
-                return strjoin(u->manager->cgroup_root, "/", slice, "/", escaped, NULL);
+                return strjoin(u->manager->cgroup_root, "/", slice, "/",
+                               escaped);
         else
-                return strjoin(u->manager->cgroup_root, "/", escaped, NULL);
+                return strjoin(u->manager->cgroup_root, "/", escaped);
 }
 
 int unit_set_cgroup_path(Unit *u, const char *path) {
@@ -1645,7 +1646,7 @@ static int unit_watch_pids_in_path(Unit *u, const char *path) {
                 while ((r = cg_read_subgroup(d, &fn)) > 0) {
                         _cleanup_free_ char *p = NULL;
 
-                        p = strjoin(path, "/", fn, NULL);
+                        p = strjoin(path, "/", fn);
                         free(fn);
 
                         if (!p)