Changes in prog structure

* src/prog.h (prog): Remove .facility.  Use facility from
the component.
(active,wait,stop): Move from union into the main struct.
All uses changed.

1 files changed, 4 insertions, 6 deletions

diff --git a/src/prog.h b/src/prog.h
index 3358885..be072e1 100644
--- a/src/prog.h
+++ b/src/prog.h
@@ -45,15 +45,14 @@ struct prog
   struct prog *next, *prev;
   enum prog_type type;
   pid_t pid;             /* PID */
-  int facility;
+  int active :1;         /* The prog is active */
+  int wait   :1;         /* Wait for this prog to terminate */
+  int stop   :1;         /* Stop this prog */
   union
   {
     struct
     {
       struct component *comp;
-      int active :1;   /* The prog is active */
-      int wait   :1;   /* Wait for this prog to terminate */
-      int stop   :1;   /* Stop this prog */
       int socket;
       struct prog *redir[2];   /* Pointers to redirectors */
       time_t timestamp;        /* Time of last startup */
@@ -84,8 +83,7 @@ struct prog
 };
 
 #define IS_COMPONENT(p) ((p)->type == TYPE_COMPONENT)
-#define IS_ACTIVE_COMPONENT(prog) \
-  (IS_COMPONENT(prog) && (prog)->v.p.active)
+#define IS_ACTIVE_COMPONENT(prog) (IS_COMPONENT(prog) && (prog)->active)
 
 struct prog *progman_locate (const char *name);
 int progman_foreach (int (*filter) (struct prog *, void *data), void *data);