chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
unit: don't show ENOENT configuration file warnings for units that are not essential
[elogind.git]
/
src
/
cgroup.c
diff --git
a/src/cgroup.c
b/src/cgroup.c
index 02c2919187dfcf842245e12d9d3ad4a66db384be..23ba5d86a9eb84d1278eff582eaf6a4889315986 100644
(file)
--- 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;
} 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;
}
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;
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;
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);
return NULL;
l = hashmap_get(m->cgroup_bondings, group);