Merge pull request #13073 from poettering/variety-galore

Variety galore
2019-07-16 15:59:31 +02:00
parent 476da0fe00 525e9b7991
commit 4119ad492f
3 changed files with 13 additions and 9 deletions
@@ -31,8 +31,7 @@ static int add_cgroup(Hashmap *cgroups, const char *path, bool is_const, struct
        assert(cgroups);
        assert(ret);

-        if (empty_or_root(path))
-                path = "/";
+        path = empty_to_root(path);

        cg = hashmap_get(cgroups, path);
        if (cg) {
@@ -48,8 +47,6 @@ static int add_cgroup(Hashmap *cgroups, const char *path, bool is_const, struct
                        return -EINVAL;

                pp = strndupa(path, e - path);
-                if (!pp)
-                        return -ENOMEM;

                r = add_cgroup(cgroups, pp, false, &parent);
                if (r < 0)
@@ -150,8 +147,7 @@ static int dump_processes(

        assert(prefix);

-        if (empty_or_root(cgroup_path))
-                cgroup_path = "/";
+        cgroup_path = empty_to_root(cgroup_path);

        cg = hashmap_get(cgroups, cgroup_path);
        if (!cg)