drop useless newline

[elogind.git] / name.h

diff --git a/name.h b/name.h
index 9c638f3f734a5aadfa3e4b3c625582ad41ad6513..cf1861f98c65e0a8a5de03f0e78421f93fb8dcab 100644 (file)
--- a/name.h
+++ b/name.h
@@ -31,7 +31,7 @@ enum NameType {
         NAME_SERVICE = 0,
         NAME_TIMER,
         NAME_SOCKET,
-        NAME_MILESTONE,
+        NAME_TARGET,
         NAME_DEVICE,
         NAME_MOUNT,
         NAME_AUTOMOUNT,
@@ -75,6 +75,8 @@ enum NameDependency {
         NAME_WANTS,
         NAME_REQUISITE,
         NAME_SOFT_REQUISITE,
+
+        /* Inverse of the above */
         NAME_REQUIRED_BY,       /* inverse of 'requires' and 'requisite' is 'required_by' */
         NAME_SOFT_REQUIRED_BY,  /* inverse of 'soft_requires' and 'soft_requisite' is 'soft_required_by' */
         NAME_WANTED_BY,         /* inverse of 'wants' */
@@ -85,7 +87,9 @@ enum NameDependency {
         /* Order */
         NAME_BEFORE,            /* inverse of before is after and vice versa */
         NAME_AFTER,
-        _NAME_DEPENDENCY_MAX
+
+        _NAME_DEPENDENCY_MAX,
+        _NAME_DEPENDENCY_INVALID = -1
 };
 
 struct Meta {
@@ -104,7 +108,6 @@ struct Meta {
          * the job for it */
         Job *job;
 
-        bool linked:1;
         bool in_load_queue:1;
 
         usec_t active_enter_timestamp;
@@ -117,7 +120,7 @@ struct Meta {
 #include "service.h"
 #include "timer.h"
 #include "socket.h"
-#include "milestone.h"
+#include "target.h"
 #include "device.h"
 #include "mount.h"
 #include "automount.h"
@@ -128,7 +131,7 @@ union Name {
         Service service;
         Timer timer;
         Socket socket;
-        Milestone milestone;
+        Target target;
         Device device;
         Mount mount;
         Automount automount;
@@ -147,7 +150,6 @@ struct NameVTable {
         int (*stop)(Name *n);
         int (*reload)(Name *n);
 
-
         bool (*can_reload)(Name *n);
 
         /* Boils down the more complex internal state of this name to
@@ -180,37 +182,38 @@ extern const NameVTable * const name_vtable[_NAME_TYPE_MAX];
 DEFINE_CAST(SOCKET, Socket);
 DEFINE_CAST(TIMER, Timer);
 DEFINE_CAST(SERVICE, Service);
-DEFINE_CAST(MILESTONE, Milestone);
+DEFINE_CAST(TARGET, Target);
 DEFINE_CAST(DEVICE, Device);
 DEFINE_CAST(MOUNT, Mount);
 DEFINE_CAST(AUTOMOUNT, Automount);
 DEFINE_CAST(SNAPSHOT, Snapshot);
 
-bool name_type_can_start(NameType t);
-bool name_type_can_reload(NameType t);
-bool name_can_reload(Name *n);
-#define name_can_start(n) name_type_can_start((n)->meta.type)
-
 NameType name_type_from_string(const char *n);
 bool name_is_valid(const char *n);
 
 Name *name_new(Manager *m);
 void name_free(Name *name);
-int name_link(Name *name);
-int name_link_names(Name *name, bool replace);
+
+int name_add_name(Name *n, const char *text);
+int name_add_dependency(Name *n, NameDependency d, Name *other);
+
+void name_add_to_load_queue(Name *n);
+
 int name_merge(Name *name, Name *other);
-int name_sanitize(Name *n);
+
 int name_load_fragment_and_dropin(Name *n);
 int name_load(Name *name);
+
 const char* name_id(Name *n);
 const char *name_description(Name *n);
 
-int name_add_name(Name *n, const char *text);
-
 NameActiveState name_active_state(Name *name);
 
 void name_dump(Name *n, FILE *f, const char *prefix);
 
+bool name_can_reload(Name *n);
+bool name_can_start(Name *n);
+
 int name_start(Name *n);
 int name_stop(Name *n);
 int name_reload(Name *n);