Spelling fixes.

[elogind.git] / src / core / unit.h

diff --git a/src/core/unit.h b/src/core/unit.h
index 049b1dbd1e79fb0d331f07fbd9d7e5675609dfcb..45849a4b126491bd6dacd06b1bea3cfbc475efbf 100644 (file)
--- a/src/core/unit.h
+++ b/src/core/unit.h
@@ -27,8 +27,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 +41,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,
@@ -87,13 +75,13 @@ enum UnitDependency {
         UNIT_REQUISITE,
         UNIT_REQUISITE_OVERRIDABLE,
         UNIT_WANTS,
-        UNIT_BIND_TO,
+        UNIT_BINDS_TO,
 
         /* Inverse of the above */
         UNIT_REQUIRED_BY,             /* inverse of 'requires' and 'requisite' is 'required_by' */
         UNIT_REQUIRED_BY_OVERRIDABLE, /* inverse of 'requires_overridable' and 'requisite_overridable' is 'soft_required_by' */
         UNIT_WANTED_BY,               /* inverse of 'wants' */
-        UNIT_BOUND_BY,                /* inverse of 'bind_to' */
+        UNIT_BOUND_BY,                /* inverse of 'binds_to' */
 
         /* Negative dependencies */
         UNIT_CONFLICTS,               /* inverse of 'conflicts' is 'conflicted_by' */
@@ -111,8 +99,8 @@ enum UnitDependency {
         UNIT_TRIGGERED_BY,
 
         /* Propagate reloads */
-        UNIT_PROPAGATE_RELOAD_TO,
-        UNIT_PROPAGATE_RELOAD_FROM,
+        UNIT_PROPAGATES_RELOAD_TO,
+        UNIT_RELOAD_PROPAGATED_FROM,
 
         /* Reference information for GC logic */
         UNIT_REFERENCES,              /* Inverse of 'references' is 'referenced_by' */
@@ -232,7 +220,7 @@ struct Unit {
         /* Ignore this unit when snapshotting */
         bool ignore_on_snapshot;
 
-        /* Did the last condition check suceed? */
+        /* Did the last condition check succeed? */
         bool condition_result;
 
         bool in_load_queue:1;
@@ -274,8 +262,6 @@ struct UnitStatusMessageFormats {
 #include "path.h"
 
 struct UnitVTable {
-        const char *suffix;
-
         /* How much memory does an object of this unit type need */
         size_t object_size;
 
@@ -537,9 +523,6 @@ int unit_add_default_target_dependency(Unit *u, Unit *target);
 
 int unit_following_set(Unit *u, Set **s);
 
-UnitType unit_name_to_type(const char *n);
-bool unit_name_is_valid(const char *n, bool template_ok);
-
 void unit_trigger_on_failure(Unit *u);
 
 bool unit_condition_test(Unit *u);
@@ -554,9 +537,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);