chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
umask: change default umask to 0022 just to be sure, and set it explicitly in all...
[elogind.git]
/
src
/
unit.c
diff --git
a/src/unit.c
b/src/unit.c
index e494834a6151d7afc9f062ee0f40662b0ada9fa7..65ee0cc35f9abccf0b560e4c5a4cd0f87bb76e9c 100644
(file)
--- a/
src/unit.c
+++ b/
src/unit.c
@@
-1772,22
+1772,22
@@
int unit_add_cgroup(Unit *u, CGroupBonding *b) {
static char *default_cgroup_path(Unit *u) {
char *p;
static char *default_cgroup_path(Unit *u) {
char *p;
- int r;
assert(u);
if (u->meta.instance) {
char *t;
assert(u);
if (u->meta.instance) {
char *t;
- if (!(t = unit_name_template(u->meta.id)))
+ t = unit_name_template(u->meta.id);
+ if (!t)
return NULL;
return NULL;
-
r = asprintf(&p, "%s/%s/%s", u->meta.manager->cgroup_hierarchy, t, u->meta.instance
);
+
p = join(u->meta.manager->cgroup_hierarchy, "/", t, "/", u->meta.instance, NULL
);
free(t);
} else
free(t);
} else
-
r = asprintf(&p, "%s/%s", u->meta.manager->cgroup_hierarchy, u->meta.id
);
+
p = join(u->meta.manager->cgroup_hierarchy, "/", u->meta.id, NULL
);
- return
r < 0 ? NULL :
p;
+ return p;
}
int unit_add_cgroup_from_text(Unit *u, const char *name) {
}
int unit_add_cgroup_from_text(Unit *u, const char *name) {