make use of unit_add_dependency_by_name() where applicable

[elogind.git] / unit.h

diff --git a/unit.h b/unit.h
index cabf230148d46310a958f47596ec01f1e6d89d52..a29c50ed97864c1006528939e73eca44486d2dfa 100644 (file)
--- a/unit.h
+++ b/unit.h
@@ -157,11 +157,9 @@ struct UnitVTable {
          * a simpler one that the engine can understand */
         UnitActiveState (*active_state)(Unit *u);
 
-        void (*fd_event)(Unit *u, int fd, uint32_t events);
+        void (*fd_event)(Unit *u, int fd, uint32_t events, Watch *w);
         void (*sigchld_event)(Unit *u, pid_t pid, int code, int status);
-        void (*timer_event)(Unit *u, int id, uint64_t n_elapsed);
-
-        void (*retry)(Unit *u);
+        void (*timer_event)(Unit *u, uint64_t n_elapsed, Watch *w);
 };
 
 extern const UnitVTable * const unit_vtable[_UNIT_TYPE_MAX];
@@ -198,6 +196,7 @@ void unit_free(Unit *u);
 
 int unit_add_name(Unit *u, const char *name);
 int unit_add_dependency(Unit *u, UnitDependency d, Unit *other);
+int unit_add_dependency_by_name(Unit *u, UnitDependency d, const char *name);
 
 void unit_add_to_load_queue(Unit *u);
 
@@ -222,14 +221,14 @@ int unit_reload(Unit *u);
 
 void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns);
 
-int unit_watch_fd(Unit *u, int fd, uint32_t events);
-void unit_unwatch_fd(Unit *u, int fd);
+int unit_watch_fd(Unit *u, int fd, uint32_t events, Watch *w);
+void unit_unwatch_fd(Unit *u, Watch *w);
 
 int unit_watch_pid(Unit *u, pid_t pid);
 void unit_unwatch_pid(Unit *u, pid_t pid);
 
-int unit_watch_timer(Unit *u, usec_t delay, int *id);
-void unit_unwatch_timer(Unit *u, int *id);
+int unit_watch_timer(Unit *u, usec_t delay, Watch *w);
+void unit_unwatch_timer(Unit *u, Watch *w);
 
 bool unit_job_is_applicable(Unit *u, JobType j);