From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sat, 15 Sep 2018 18:03:32 +0000 (+0200)
Subject: pid1: drop now-unused path parameter to resolve_template()
X-Git-Tag: v240~629^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23e8c796654a641d1e231eb16406db4396093269;p=thirdparty%2Fsystemd.git

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

diff --git a/src/core/unit.c b/src/core/unit.c
index 68d6b4934ca..65711bbc81f 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -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;