summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-07-08 17:43:14 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-07-19 16:51:14 +0200
commit96cf3ec96651939e9a5d48547854cb64b166544c (patch)
tree2e2cd03a586e97745863d47758dfc46fa6fd9407
parent3c4e3031367fb0a2b754fd533d4f38ce8a6e9586 (diff)
downloadsystemd-96cf3ec96651939e9a5d48547854cb64b166544c.tar.gz
pid1: get rid of unit_supported() helper
Another case where "open code" is easier to read than the helper.
-rw-r--r--src/core/unit.c6
-rw-r--r--src/core/unit.h4
2 files changed, 3 insertions, 7 deletions
diff --git a/src/core/unit.c b/src/core/unit.c
index 700f38a6cd..2cd58c4704 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 7456f99efe..094a451f3c 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);