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

pid1: drop now-unused path parameter to resolve_template()

Browse source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2018-09-15 20:03:32 +02:00
parent 5a72417084
commit 23e8c79665
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/core/unit.c
View file

@ -2894,17 +2894,14 @@ int unit_add_two_dependencies(Unit *u, UnitDependency d, UnitDependency e, Unit
return unit_add_dependency(u, e, other, add_reference, mask);
}
static int resolve_template(Unit *u, const char *name, const char*path, char **buf, const char **ret) {
static int resolve_template(Unit *u, const char *name, char **buf, const char **ret) {
int r;
assert(u);
assert(name || path);
assert(name);
assert(buf);
assert(ret);
if (!name)
name = basename(path);
if (!unit_name_is_valid(name, UNIT_NAME_TEMPLATE)) {
*buf = NULL;
*ret = name;
@ -2937,7 +2934,7 @@ int unit_add_dependency_by_name(Unit *u, UnitDependency d, const char *name, boo
assert(u);
assert(name);
r = resolve_template(u, name, NULL, &buf, &name);
r = resolve_template(u, name, &buf, &name);
if (r < 0)
return r;
@ -2956,7 +2953,7 @@ int unit_add_two_dependencies_by_name(Unit *u, UnitDependency d, UnitDependency
assert(u);
assert(name);
r = resolve_template(u, name, NULL, &buf, &name);
r = resolve_template(u, name, &buf, &name);
if (r < 0)
return r;