* Eliminate EVT_OUTPUTMSG server extensions (don't need them anymore)

[citadel.git] / citadel / serv_test.c

diff --git a/citadel/serv_test.c b/citadel/serv_test.c
index 0d3ce30bce1604542171850c960a77627e295c66..afee1effa00bd1f08e60da3c362cf2a674545539 100644 (file)
--- a/citadel/serv_test.c
+++ b/citadel/serv_test.c
@@ -1,4 +1,10 @@
-/* $Id$ */
+/*
+ * $Id$
+ *
+ * A skeleton module to test the dynamic loader.
+ *
+ */
+
 #include "sysdep.h"
 #include <stdlib.h>
 #include <unistd.h>
@@ -8,18 +14,28 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <sys/time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
 #include "citadel.h"
 #include "server.h"
-#include <time.h>
 #include "sysdep_decls.h"
 #include "citserver.h"
 #include "support.h"
 #include "config.h"
-#include "dynloader.h"
+#include "serv_extensions.h"
 #include "room_ops.h"
 #include "policy.h"
 #include "database.h"
@@ -28,32 +44,25 @@
 extern struct CitContext *ContextList;
 
 void CleanupTest(void) {
-       lprintf(9, "--- test of adding an unload hook --- \n");
+       lprintf(CTDL_DEBUG, "--- test of adding an unload hook --- \n");
        }
 
 void NewRoomTest(void) {
-       lprintf(9, "--- test module was told we're now in a new room ---\n");
+       lprintf(CTDL_DEBUG, "--- test module was told we're now in a new room ---\n");
        }
 
 void SessionStartTest(void) {
-       lprintf(9, "--- starting up session %d ---\n",
+       lprintf(CTDL_DEBUG, "--- starting up session %d ---\n",
                CC->cs_pid);
        }
 
 void SessionStopTest(void) {
-       lprintf(9, "--- ending session %d ---\n", 
+       lprintf(CTDL_DEBUG, "--- ending session %d ---\n", 
                CC->cs_pid);
        }
 
 void LoginTest(void) {
-       lprintf(9, "--- Hello, %s ---\n", CC->curr_user);
-       }
-
-
-void Ygorl(char *username, long usernum) {
-       if (!strcasecmp(username, "Unsuspecting User")) {
-               strcpy(username, "Flaming Asshole");
-               }
+       lprintf(CTDL_DEBUG, "--- Hello, %s ---\n", CC->curr_user);
        }
 
 void LogTest(char *buf) {
@@ -62,14 +71,13 @@ void LogTest(char *buf) {
        }
 
 
-char *Dynamic_Module_Init(void)
+char *serv_test_init(void)
 {
    CtdlRegisterCleanupHook(CleanupTest);
    CtdlRegisterSessionHook(NewRoomTest, EVT_NEWROOM);
    CtdlRegisterSessionHook(SessionStartTest, EVT_START);
    CtdlRegisterSessionHook(SessionStopTest, EVT_STOP);
    CtdlRegisterSessionHook(LoginTest, EVT_LOGIN);
-   CtdlRegisterUserHook(Ygorl, EVT_OUTPUTMSG);
    CtdlRegisterLogHook(LogTest, 1);
    return "$Id$";
 }