summaryrefslogtreecommitdiff
path: root/src/unit.h
diff options
context:
space:
mode:
authorMatthew Miller <mattdm@mattdm.org>2010-08-31 00:23:34 +0200
committerLennart Poettering <lennart@poettering.net>2010-08-31 00:23:34 +0200
commitfdf20a316035779bbec469e11d73c7544acbf30f (patch)
treec99f2d7a60e5816ff554c48bcfbe497d0c22a30d /src/unit.h
parent74ac3cbd509de2f5995542aa5db39328e8cbd22a (diff)
manager: add missing second part of s/maintenance/failed/
Diffstat (limited to 'src/unit.h')
-rw-r--r--src/unit.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/unit.h b/src/unit.h
index e3c0c0f060..15e7fedd0e 100644
--- a/src/unit.h
+++ b/src/unit.h
@@ -61,7 +61,7 @@ enum UnitType {
enum UnitLoadState {
UNIT_STUB,
UNIT_LOADED,
- UNIT_FAILED,
+ UNIT_ERROR,
UNIT_MERGED,
_UNIT_LOAD_STATE_MAX,
_UNIT_LOAD_STATE_INVALID = -1
@@ -71,7 +71,7 @@ enum UnitActiveState {
UNIT_ACTIVE,
UNIT_RELOADING,
UNIT_INACTIVE,
- UNIT_MAINTENANCE,
+ UNIT_FAILED,
UNIT_ACTIVATING,
UNIT_DEACTIVATING,
_UNIT_ACTIVE_STATE_MAX,
@@ -87,11 +87,11 @@ static inline bool UNIT_IS_ACTIVE_OR_ACTIVATING(UnitActiveState t) {
}
static inline bool UNIT_IS_INACTIVE_OR_DEACTIVATING(UnitActiveState t) {
- return t == UNIT_INACTIVE || t == UNIT_MAINTENANCE || t == UNIT_DEACTIVATING;
+ return t == UNIT_INACTIVE || t == UNIT_FAILED || t == UNIT_DEACTIVATING;
}
-static inline bool UNIT_IS_INACTIVE_OR_MAINTENANCE(UnitActiveState t) {
- return t == UNIT_INACTIVE || t == UNIT_MAINTENANCE;
+static inline bool UNIT_IS_INACTIVE_OR_FAILED(UnitActiveState t) {
+ return t == UNIT_INACTIVE || t == UNIT_FAILED;
}
enum UnitDependency {
@@ -304,8 +304,8 @@ struct UnitVTable {
void (*sigchld_event)(Unit *u, pid_t pid, int code, int status);
void (*timer_event)(Unit *u, uint64_t n_elapsed, Watch *w);
- /* Reset maintenance state if we are in maintainance state */
- void (*reset_maintenance)(Unit *u);
+ /* Reset failed state if we are in failed state */
+ void (*reset_failed)(Unit *u);
/* Called whenever any of the cgroups this unit watches for
* ran empty */
@@ -495,7 +495,7 @@ void unit_status_printf(Unit *u, const char *format, ...);
bool unit_need_daemon_reload(Unit *u);
-void unit_reset_maintenance(Unit *u);
+void unit_reset_failed(Unit *u);
Unit *unit_following(Unit *u);