diff --git a/src/basic/unit-def.c b/src/basic/unit-def.c index 129d61b99cb..3be9d16333b 100644 --- a/src/basic/unit-def.c +++ b/src/basic/unit-def.c @@ -344,6 +344,20 @@ static const char* const notify_access_table[_NOTIFY_ACCESS_MAX] = { DEFINE_STRING_TABLE_LOOKUP(notify_access, NotifyAccess); +static const char* const job_mode_table[_JOB_MODE_MAX] = { + [JOB_FAIL] = "fail", + [JOB_REPLACE] = "replace", + [JOB_REPLACE_IRREVERSIBLY] = "replace-irreversibly", + [JOB_ISOLATE] = "isolate", + [JOB_FLUSH] = "flush", + [JOB_IGNORE_DEPENDENCIES] = "ignore-dependencies", + [JOB_IGNORE_REQUIREMENTS] = "ignore-requirements", + [JOB_TRIGGERING] = "triggering", + [JOB_RESTART_DEPENDENCIES] = "restart-dependencies", +}; + +DEFINE_STRING_TABLE_LOOKUP(job_mode, JobMode); + SpecialGlyph unit_active_state_to_glyph(UnitActiveState state) { static const SpecialGlyph map[_UNIT_ACTIVE_STATE_MAX] = { [UNIT_ACTIVE] = SPECIAL_GLYPH_BLACK_CIRCLE, diff --git a/src/basic/unit-def.h b/src/basic/unit-def.h index bead8b47ac1..a9548e29913 100644 --- a/src/basic/unit-def.h +++ b/src/basic/unit-def.h @@ -283,6 +283,20 @@ typedef enum NotifyAccess { _NOTIFY_ACCESS_INVALID = -EINVAL, } NotifyAccess; +typedef enum JobMode { + JOB_FAIL, /* Fail if a conflicting job is already queued */ + JOB_REPLACE, /* Replace an existing conflicting job */ + JOB_REPLACE_IRREVERSIBLY,/* Like JOB_REPLACE + produce irreversible jobs */ + JOB_ISOLATE, /* Start a unit, and stop all others */ + JOB_FLUSH, /* Flush out all other queued jobs when queueing this one */ + JOB_IGNORE_DEPENDENCIES, /* Ignore both requirement and ordering dependencies */ + JOB_IGNORE_REQUIREMENTS, /* Ignore requirement dependencies */ + JOB_TRIGGERING, /* Adds TRIGGERED_BY dependencies to the same transaction */ + JOB_RESTART_DEPENDENCIES,/* A "start" job for the specified unit becomes "restart" for depending units */ + _JOB_MODE_MAX, + _JOB_MODE_INVALID = -EINVAL, +} JobMode; + char* unit_dbus_path_from_name(const char *name); int unit_name_from_dbus_path(const char *path, char **name); @@ -346,4 +360,7 @@ UnitDependency unit_dependency_from_string(const char *s) _pure_; const char* notify_access_to_string(NotifyAccess i) _const_; NotifyAccess notify_access_from_string(const char *s) _pure_; +const char* job_mode_to_string(JobMode t) _const_; +JobMode job_mode_from_string(const char *s) _pure_; + SpecialGlyph unit_active_state_to_glyph(UnitActiveState state); diff --git a/src/core/job.c b/src/core/job.c index 8fbbe757feb..0265e703498 100644 --- a/src/core/job.c +++ b/src/core/job.c @@ -1651,20 +1651,6 @@ static const char* const job_type_table[_JOB_TYPE_MAX] = { DEFINE_STRING_TABLE_LOOKUP(job_type, JobType); -static const char* const job_mode_table[_JOB_MODE_MAX] = { - [JOB_FAIL] = "fail", - [JOB_REPLACE] = "replace", - [JOB_REPLACE_IRREVERSIBLY] = "replace-irreversibly", - [JOB_ISOLATE] = "isolate", - [JOB_FLUSH] = "flush", - [JOB_IGNORE_DEPENDENCIES] = "ignore-dependencies", - [JOB_IGNORE_REQUIREMENTS] = "ignore-requirements", - [JOB_TRIGGERING] = "triggering", - [JOB_RESTART_DEPENDENCIES] = "restart-dependencies", -}; - -DEFINE_STRING_TABLE_LOOKUP(job_mode, JobMode); - static const char* const job_result_table[_JOB_RESULT_MAX] = { [JOB_DONE] = "done", [JOB_CANCELED] = "canceled", diff --git a/src/core/job.h b/src/core/job.h index f3daf9d094a..406eab74ae2 100644 --- a/src/core/job.h +++ b/src/core/job.h @@ -14,7 +14,6 @@ typedef struct Job Job; typedef struct JobDependency JobDependency; typedef enum JobType JobType; typedef enum JobState JobState; -typedef enum JobMode JobMode; typedef enum JobResult JobResult; typedef struct Manager Manager; typedef struct Unit Unit; @@ -71,20 +70,6 @@ enum JobState { _JOB_STATE_INVALID = -EINVAL, }; -enum JobMode { - JOB_FAIL, /* Fail if a conflicting job is already queued */ - JOB_REPLACE, /* Replace an existing conflicting job */ - JOB_REPLACE_IRREVERSIBLY,/* Like JOB_REPLACE + produce irreversible jobs */ - JOB_ISOLATE, /* Start a unit, and stop all others */ - JOB_FLUSH, /* Flush out all other queued jobs when queueing this one */ - JOB_IGNORE_DEPENDENCIES, /* Ignore both requirement and ordering dependencies */ - JOB_IGNORE_REQUIREMENTS, /* Ignore requirement dependencies */ - JOB_TRIGGERING, /* Adds TRIGGERED_BY dependencies to the same transaction */ - JOB_RESTART_DEPENDENCIES,/* A "start" job for the specified unit becomes "restart" for depending units */ - _JOB_MODE_MAX, - _JOB_MODE_INVALID = -EINVAL, -}; - enum JobResult { JOB_DONE, /* Job completed successfully (or skipped due to an unmet ConditionXYZ=) */ JOB_CANCELED, /* Job canceled by a conflicting job installation or by explicit cancel request */ @@ -243,9 +228,6 @@ JobType job_type_from_string(const char *s) _pure_; const char* job_state_to_string(JobState t) _const_; JobState job_state_from_string(const char *s) _pure_; -const char* job_mode_to_string(JobMode t) _const_; -JobMode job_mode_from_string(const char *s) _pure_; - const char* job_result_to_string(JobResult t) _const_; JobResult job_result_from_string(const char *s) _pure_;