picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

util: more join() optimizations

Browse source
This commit is contained in:
Lennart Poettering 2011-08-01 02:45:51 +02:00
parent 44d9105692
commit cd0ed1db9b
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/load-dropin.c
View file

@ -100,10 +100,10 @@ static int process_dir(Unit *u, const char *unit_path, const char *name, const c
if (!(template = unit_name_template(name)))
return -ENOMEM;
r = asprintf(&path, "%s/%s%s", unit_path, template, suffix);
path = join(unit_path, "/", template, suffix, NULL);
free(template);
if (r < 0)
if (!path)
return -ENOMEM;
if (u->meta.manager->unit_path_cache &&

10
src/unit.c
View file

@ -1772,22 +1772,22 @@ int unit_add_cgroup(Unit *u, CGroupBonding *b) {
static char *default_cgroup_path(Unit *u) {
char *p;
int r;
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;
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
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) {