shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-03-12 08:58:20 +03:00
Code

pid1: get rid of unit_supported() helper

Browse Source 
Another case where "open code" is easier to read than the helper.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2019-07-08 17:43:14 +02:00
parent 3c4e303136
commit 96cf3ec966
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/unit.c
View File

@ -1791,7 +1791,7 @@ int unit_start(Unit *u) {
* condition checks, so that we rather return condition check errors (which are usually not * 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). * 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; return -EOPNOTSUPP;
/* Let's make sure that the deps really are in order before we start this. Normally the job engine /* 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) if (u->load_state != UNIT_LOADED)
return false; return false;
if (!unit_supported(u)) if (!unit_type_supported(u->type))
return false; return false;
/* Scope units may be started only once */ /* Scope units may be started only once */
@ -1875,7 +1875,7 @@ int unit_stop(Unit *u) {
bool unit_can_stop(Unit *u) { bool unit_can_stop(Unit *u) {
assert(u); assert(u);
if (!unit_supported(u)) if (!unit_type_supported(u->type))
return false; return false;
if (u->perpetual) if (u->perpetual)

4
src/core/unit.h
View File

@ -800,10 +800,6 @@ bool unit_is_unneeded(Unit *u);
pid_t unit_control_pid(Unit *u); pid_t unit_control_pid(Unit *u);
pid_t unit_main_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); void unit_warn_if_dir_nonempty(Unit *u, const char* where);
int unit_fail_if_noncanonical(Unit *u, const char* where); int unit_fail_if_noncanonical(Unit *u, const char* where);