unit-name: remove unit_name_is_valid_no_type() and move unit_name_is_valid() to unit-name.h

3 files changed, 1 insertions, 26 deletions

diff --git a/src/core/manager.c b/src/core/manager.c
index f07d26e9cd..7bd484be6c 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -796,7 +796,7 @@ int manager_load_unit_prepare(Manager *m, const char *name, const char *path, DB
 
         t = unit_name_to_type(name);
 
-        if (t == _UNIT_TYPE_INVALID || !unit_name_is_valid_no_type(name, false)) {
+        if (t == _UNIT_TYPE_INVALID || !unit_name_is_valid(name, false)) {
                 dbus_set_error(e, BUS_ERROR_INVALID_NAME, "Unit name %s is not valid.", name);
                 return -EINVAL;
         }
diff --git a/src/core/unit.c b/src/core/unit.c
index 64e26b7a94..2d18976c26 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -2647,28 +2647,6 @@ bool unit_pending_active(Unit *u) {
         return false;
 }
 
-UnitType unit_name_to_type(const char *n) {
-        UnitType t;
-
-        assert(n);
-
-        for (t = 0; t < _UNIT_TYPE_MAX; t++)
-                if (endswith(n, unit_vtable[t]->suffix))
-                        return t;
-
-        return _UNIT_TYPE_INVALID;
-}
-
-bool unit_name_is_valid(const char *n, bool template_ok) {
-        UnitType t;
-
-        t = unit_name_to_type(n);
-        if (t < 0 || t >= _UNIT_TYPE_MAX)
-                return false;
-
-        return unit_name_is_valid_no_type(n, template_ok);
-}
-
 int unit_kill(Unit *u, KillWho w, KillMode m, int signo, DBusError *error) {
         assert(u);
         assert(w >= 0 && w < _KILL_WHO_MAX);
diff --git a/src/core/unit.h b/src/core/unit.h
index 049b1dbd1e..c20c532c16 100644
--- a/src/core/unit.h
+++ b/src/core/unit.h
@@ -537,9 +537,6 @@ int unit_add_default_target_dependency(Unit *u, Unit *target);
 
 int unit_following_set(Unit *u, Set **s);
 
-UnitType unit_name_to_type(const char *n);
-bool unit_name_is_valid(const char *n, bool template_ok);
-
 void unit_trigger_on_failure(Unit *u);
 
 bool unit_condition_test(Unit *u);