diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2012-07-10 17:18:09 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2012-07-10 17:18:49 +0200 |
commit | f69614f811b133ececad4394e88f9549a017bd4e (patch) | |
tree | 056a308e4aa1eba68fd296238daacfd78833dee2 /src/core | |
parent | bcbe497e5a73d889e8799f8a3680c303afede347 (diff) |
unit: Move UnitLoadState definitions from core/unit.c to shared/unit-name.c
This makes it possible to use them from systemctl without linking
against the core.
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/unit.c | 10 | ||||
-rw-r--r-- | src/core/unit.h | 14 |
2 files changed, 0 insertions, 24 deletions
diff --git a/src/core/unit.c b/src/core/unit.c index 2d18976c26..37711afeaf 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -2746,16 +2746,6 @@ int unit_add_mount_links(Unit *u) { return 0; } -static const char* const unit_load_state_table[_UNIT_LOAD_STATE_MAX] = { - [UNIT_STUB] = "stub", - [UNIT_LOADED] = "loaded", - [UNIT_ERROR] = "error", - [UNIT_MERGED] = "merged", - [UNIT_MASKED] = "masked" -}; - -DEFINE_STRING_TABLE_LOOKUP(unit_load_state, UnitLoadState); - static const char* const unit_active_state_table[_UNIT_ACTIVE_STATE_MAX] = { [UNIT_ACTIVE] = "active", [UNIT_RELOADING] = "reloading", diff --git a/src/core/unit.h b/src/core/unit.h index b0aa02f6ae..0e1e72ebf0 100644 --- a/src/core/unit.h +++ b/src/core/unit.h @@ -28,7 +28,6 @@ typedef struct Unit Unit; typedef struct UnitVTable UnitVTable; typedef enum UnitType UnitType; -typedef enum UnitLoadState UnitLoadState; typedef enum UnitActiveState UnitActiveState; typedef enum UnitDependency UnitDependency; typedef struct UnitRef UnitRef; @@ -43,16 +42,6 @@ typedef struct UnitStatusMessageFormats UnitStatusMessageFormats; #include "install.h" #include "unit-name.h" -enum UnitLoadState { - UNIT_STUB, - UNIT_LOADED, - UNIT_ERROR, - UNIT_MERGED, - UNIT_MASKED, - _UNIT_LOAD_STATE_MAX, - _UNIT_LOAD_STATE_INVALID = -1 -}; - enum UnitActiveState { UNIT_ACTIVE, UNIT_RELOADING, @@ -549,9 +538,6 @@ void unit_ref_unset(UnitRef *ref); int unit_add_one_mount_link(Unit *u, Mount *m); int unit_add_mount_links(Unit *u); -const char *unit_load_state_to_string(UnitLoadState i); -UnitLoadState unit_load_state_from_string(const char *s); - const char *unit_active_state_to_string(UnitActiveState i); UnitActiveState unit_active_state_from_string(const char *s); |