diff options
author | Lennart Poettering <lennart@poettering.net> | 2010-08-11 22:04:22 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2010-08-11 22:04:25 +0200 |
commit | e364ad0628b5930a671ae5be863b960f4bd748a8 (patch) | |
tree | 1427ac128d3530f696e49b6f5e482488399c9b6e /src/cgroup.c | |
parent | 10f8e83cbb10c73b980c9b3b895ac044e600ba0c (diff) |
clang: fix numerous little issues found with clang-analyzer
Diffstat (limited to 'src/cgroup.c')
-rw-r--r-- | src/cgroup.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/cgroup.c b/src/cgroup.c index 02c2919187..23ba5d86a9 100644 --- a/src/cgroup.c +++ b/src/cgroup.c @@ -231,7 +231,7 @@ int manager_setup_cgroup(Manager *m) { } else { /* We need a new root cgroup */ m->cgroup_hierarchy = NULL; - if ((r = asprintf(&m->cgroup_hierarchy, "%s%s", streq(current, "/") ? "" : current, suffix)) < 0) { + if (asprintf(&m->cgroup_hierarchy, "%s%s", streq(current, "/") ? "" : current, suffix) < 0) { r = -ENOMEM; goto finish; } @@ -325,14 +325,13 @@ int cgroup_notify_empty(Manager *m, const char *group) { Unit* cgroup_unit_by_pid(Manager *m, pid_t pid) { CGroupBonding *l, *b; char *group = NULL; - int r; assert(m); if (pid <= 1) return NULL; - if ((r = cg_get_by_pid(SYSTEMD_CGROUP_CONTROLLER, pid, &group))) + if (cg_get_by_pid(SYSTEMD_CGROUP_CONTROLLER, pid, &group) < 0) return NULL; l = hashmap_get(m->cgroup_bondings, group); |