[Initng-svn] r3798 - initng-contrib/trunk/plugins/splash

[svn at initng.thinktux.net]

Author: trigger
Date: Thu Apr 13 17:57:52 2006
New Revision: 3798

Modified:
   initng-contrib/trunk/plugins/splash/initng_splash.c

Log:
the splash plugin compiles now again!!
i think i will move it to initng again soon

Modified: initng-contrib/trunk/plugins/splash/initng_splash.c
==============================================================================
--- initng-contrib/trunk/plugins/splash/initng_splash.c	(original)
+++ initng-contrib/trunk/plugins/splash/initng_splash.c	Thu Apr 13 17:57:52 2006
@@ -28,23 +28,23 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include <initng.h>
-#include <initng_global.h>
-#include <initng_process_db.h>
-#include <initng_service_cache.h>
-#include <initng_handler.h>
-#include <main.h>
-#include <initng_active_db.h>
-#include <initng_toolbox.h>
-#include <initng_plugin_hook.h>
-#include <initng_load_module.h>
-#include <initng_plugin_callers.h>
-#include <initng_global.h>
-#include <initng_error.h>
-#include <initng_plugin.h>
-#include <initng_control_command.h>
-#include <initng_static_data_id.h>
-#include <initng_static_states.h>
+#include <initng/initng.h>
+#include <initng/initng_is.h>
+#include <initng/initng_global.h>
+#include <initng/initng_process_db.h>
+#include <initng/initng_service_cache.h>
+#include <initng/initng_handler.h>
+#include <initng/initng_active_db.h>
+#include <initng/initng_toolbox.h>
+#include <initng/initng_plugin_hook.h>
+#include <initng/initng_load_module.h>
+#include <initng/initng_plugin_callers.h>
+#include <initng/initng_global.h>
+#include <initng/initng_error.h>
+#include <initng/initng_plugin.h>
+#include <initng/initng_control_command.h>
+#include <initng/initng_static_data_id.h>
+#include <initng/initng_static_states.h>
 
 #include "initng_splash.h"
 
@@ -182,6 +182,18 @@
             char svc_name[100];
             const char *svc_status = NULL;
             int i;
+            a_state_h * loading = initng_active_state_find("LOADING");
+            a_state_h * running = initng_active_state_find("RUNNING");
+            a_state_h * done = initng_active_state_find("DONE");
+            a_state_h * starting = initng_active_state_find("STARTING");
+            a_state_h * waiting_for_start_dep = initng_active_state_find("WAITING_FOR_START_DEP");
+            a_state_h * fail_starting = initng_active_state_find("FAIL_STARTING");
+            a_state_h * start_dep_failed = initng_active_state_find("START_DEP_FAILED");
+            a_state_h * fail_stopping = initng_active_state_find("FAIL_STOPPING");
+            a_state_h * stop_dep_failed = initng_active_state_find("STOP_DEP_FAILED");
+            a_state_h * stopped = initng_active_state_find("STOPPED");
+            a_state_h * stopping = initng_active_state_find("STOPPING");
+            a_state_h * waiting_for_stop_dep = initng_active_state_find("WAITING_FOR_STOP_DEP");
 
             i = 0;
             if (service->name)
@@ -202,26 +214,33 @@
                     svc_name[99] = '\0';
                 }
 
-                if (service->current_state == &LOADING ||
-                    service->current_state == &STARTING ||
-                    service->current_state == &WAITING_FOR_START_DEP)
-                    svc_status = "svc_start";
-                if (service->current_state == &FAIL_STARTING ||
-                    service->current_state == &START_DEP_FAILED)
-                    svc_status = "svc_start_failed";
-                if (service->current_state == &RUNNING
-                    || service->current_state == &DONE)
-                    svc_status = "svc_started";
-                if (service->current_state == &STOP_DEP_FAILED ||
-                    service->current_state == &FAIL_STOPPING)
-                    svc_status = "svc_stop_failed";
-                if (service->current_state == &STOPPED)
+                if (IS_MARK(service, loading) ||
+                    IS_MARK(service, starting) ||
+                    IS_MARK(service, waiting_for_start_dep)) {
+                    	svc_status = "svc_start";
+                    }
+                if (IS_MARK(service, fail_starting) ||
+                    IS_MARK(service, start_dep_failed)) {
+                    	svc_status = "svc_start_failed";
+                    }
+                if (IS_MARK(service, running)
+                    || IS_MARK(service, done)) {
+                    	svc_status = "svc_started";
+                    }
+                if (IS_MARK(service, stop_dep_failed) ||
+                    IS_MARK(service, fail_stopping)) {
+                    	svc_status = "svc_stop_failed";
+                    }
+                if (IS_MARK(service, stopped)) {
                     svc_status = "svc_stopped";
-                if (service->current_state == &STOPPING ||
-                    service->current_state == &WAITING_FOR_STOP_DEP)
-                    svc_status = "svc_stop";
-                if (svc_status)
+                }
+                if (IS_MARK(service, stopping) ||
+                    IS_MARK(service, waiting_for_stop_dep)) {
+                    	svc_status = "svc_stop";
+                    }
+                if (svc_status) {
                     fprintf(fd, "update_svc %s %s\n", svc_name, svc_status);
+                }
             }
             /*
              * repaint is an Expensive operation, but required