summaryrefslogtreecommitdiff
path: root/src/unit.h
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-07-01 03:34:15 +0200
committerLennart Poettering <lennart@poettering.net>2010-07-01 03:34:15 +0200
commit032ff4afc953cae076ce0ee6a0b85020eeb1a75a (patch)
treea02edabae64a7b9d52c33b6ee77f40e59ad0fb19 /src/unit.h
parent2419cc5bdb66304adf7be4cf60af91979c5d24d9 (diff)
unit: shorten active state enums to make systemctl output nicer
Diffstat (limited to 'src/unit.h')
-rw-r--r--src/unit.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/unit.h b/src/unit.h
index 03031892d0..aa80aadb1b 100644
--- a/src/unit.h
+++ b/src/unit.h
@@ -78,9 +78,9 @@ enum UnitLoadState {
enum UnitActiveState {
UNIT_ACTIVE,
- UNIT_ACTIVE_RELOADING,
+ UNIT_RELOADING,
UNIT_INACTIVE,
- UNIT_INACTIVE_MAINTENANCE,
+ UNIT_MAINTENANCE,
UNIT_ACTIVATING,
UNIT_DEACTIVATING,
_UNIT_ACTIVE_STATE_MAX,
@@ -88,19 +88,19 @@ enum UnitActiveState {
};
static inline bool UNIT_IS_ACTIVE_OR_RELOADING(UnitActiveState t) {
- return t == UNIT_ACTIVE || t == UNIT_ACTIVE_RELOADING;
+ return t == UNIT_ACTIVE || t == UNIT_RELOADING;
}
static inline bool UNIT_IS_ACTIVE_OR_ACTIVATING(UnitActiveState t) {
- return t == UNIT_ACTIVE || t == UNIT_ACTIVATING || t == UNIT_ACTIVE_RELOADING;
+ return t == UNIT_ACTIVE || t == UNIT_ACTIVATING || t == UNIT_RELOADING;
}
static inline bool UNIT_IS_INACTIVE_OR_DEACTIVATING(UnitActiveState t) {
- return t == UNIT_INACTIVE || t == UNIT_INACTIVE_MAINTENANCE || t == UNIT_DEACTIVATING;
+ return t == UNIT_INACTIVE || t == UNIT_MAINTENANCE || t == UNIT_DEACTIVATING;
}
static inline bool UNIT_IS_INACTIVE_OR_MAINTENANCE(UnitActiveState t) {
- return t == UNIT_INACTIVE || t == UNIT_INACTIVE_MAINTENANCE;
+ return t == UNIT_INACTIVE || t == UNIT_MAINTENANCE;
}
enum UnitDependency {