X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fpath.h;h=0dff1203318fa73a12285550f9f2fd77ec1563d8;hp=e0feeea7117145362cf5e9ddad3e7edb45acd4f3;hb=cc5524ecc60a83fb88cac02fe02e21cde3951a25;hpb=18c78fb1af5415bb6f87d9c7cae1f9c60e14ae24

diff --git a/src/path.h b/src/path.h
index e0feeea71..0dff12033 100644
--- a/src/path.h
+++ b/src/path.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foopathhfoo
 #define foopathhfoo
@@ -31,7 +31,7 @@ typedef enum PathState {
         PATH_DEAD,
         PATH_WAITING,
         PATH_RUNNING,
-        PATH_MAINTENANCE,
+        PATH_FAILED,
         _PATH_STATE_MAX,
         _PATH_STATE_INVALID = -1
 } PathState;
@@ -45,16 +45,18 @@ typedef enum PathType {
 } PathType;
 
 typedef struct PathSpec {
-        PathType type;
         char *path;
 
+        Watch watch;
+
+        LIST_FIELDS(struct PathSpec, spec);
+
+        PathType type;
         int inotify_fd;
         int primary_wd;
-        bool previous_exists;
 
-        Watch watch;
+        bool previous_exists;
 
-        LIST_FIELDS(struct PathSpec, spec);
 } PathSpec;
 
 struct Path {
@@ -62,10 +64,12 @@ struct Path {
 
         LIST_HEAD(PathSpec, specs);
 
-        PathState state, deserialized_state;
         Unit *unit;
 
+        PathState state, deserialized_state;
+
         bool failure;
+        bool inotify_triggered;
 };
 
 void path_unit_notify(Unit *u, UnitActiveState new_state);