From 96cf3ec96651939e9a5d48547854cb64b166544c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 8 Jul 2019 17:43:14 +0200 Subject: [PATCH] pid1: get rid of unit_supported() helper Another case where "open code" is easier to read than the helper. --- src/core/unit.c | 6 +++--- src/core/unit.h | 4 ---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/core/unit.c b/src/core/unit.c index 700f38a..2cd58c4 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -1791,7 +1791,7 @@ int unit_start(Unit *u) { * condition checks, so that we rather return condition check errors (which are usually not * considered a true failure) than "not supported" errors (which are considered a failure). */ - if (!unit_supported(u)) + if (!unit_type_supported(u->type)) return -EOPNOTSUPP; /* Let's make sure that the deps really are in order before we start this. Normally the job engine @@ -1826,7 +1826,7 @@ bool unit_can_start(Unit *u) { if (u->load_state != UNIT_LOADED) return false; - if (!unit_supported(u)) + if (!unit_type_supported(u->type)) return false; /* Scope units may be started only once */ @@ -1875,7 +1875,7 @@ int unit_stop(Unit *u) { bool unit_can_stop(Unit *u) { assert(u); - if (!unit_supported(u)) + if (!unit_type_supported(u->type)) return false; if (u->perpetual) diff --git a/src/core/unit.h b/src/core/unit.h index 7456f99..094a451 100644 --- a/src/core/unit.h +++ b/src/core/unit.h @@ -800,10 +800,6 @@ bool unit_is_unneeded(Unit *u); pid_t unit_control_pid(Unit *u); pid_t unit_main_pid(Unit *u); -static inline bool unit_supported(Unit *u) { - return unit_type_supported(u->type); -} - void unit_warn_if_dir_nonempty(Unit *u, const char* where); int unit_fail_if_noncanonical(Unit *u, const char* where); -- 2.7.4