Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

[citadel.git] / citadel / serv_extensions.h

diff --git a/citadel/serv_extensions.h b/citadel/serv_extensions.h
index a9e150b975ef69112d8d519d48b7595d0d5306e7..b2d556377828e0b1ea0b8631dc398e20386a6c46 100644 (file)
--- a/citadel/serv_extensions.h
+++ b/citadel/serv_extensions.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 
 #ifndef SERV_EXTENSIONS_H
 #define SERV_EXTENSIONS_H
@@ -113,7 +112,7 @@ extern struct DeleteFunctionHook *DeleteHookTable;
  */
 struct XmsgFunctionHook {
        struct XmsgFunctionHook *next;
-       int (*h_function_pointer) (char *, char *, char *);
+       int (*h_function_pointer) (char *, char *, char *, char *);
        int order;
 };
 extern struct XmsgFunctionHook *XmsgHookTable;
@@ -149,18 +148,10 @@ struct RoomFunctionHook {
 extern struct RoomFunctionHook *RoomHookTable;
 
 
-struct MaintenanceThreadHook {
-       struct MaintenanceThreadHook *next;
-       char *name;
-       void *(*fcn_ptr) (void *arg);
-       pthread_t MaintenanceThread_tid;
-};
-extern struct MaintenanceThreadHook *MaintenanceThreadHookTable;
-
 
 struct SearchFunctionHook {
        struct SearchFunctionHook *next;
-       void (*fcn_ptr) (int *, long **, char *);
+       void (*fcn_ptr) (int *, long **, const char *);
        char *name;
 };
 extern struct SearchFunctionHook *SearchFunctionHookTable;
@@ -177,7 +168,7 @@ void PerformSessionHooks(int EventType);
 void CtdlDestroyUserHooks(void);
 void PerformUserHooks(struct ctdluser *usbuf, int EventType);
 
-int PerformXmsgHooks(char *, char *, char *);
+int PerformXmsgHooks(char *, char *, char *, char *);
 void CtdlDestroyXmsgHooks(void);
 
 
@@ -203,9 +194,10 @@ void CtdlDestroyProtoHooks(void);
 
 void CtdlDestroyServiceHook(void);
 
+void CtdlDestroySearchHooks(void);
+
 void CtdlDestroyFixedOutputHooks(void);
 int PerformFixedOutputHooks(char *, char *, int);
 
-void CtdlModuleDoSearch(int *num_msgs, long **search_msgs, char *search_string, char *func_name);
 
 #endif /* SERV_EXTENSIONS_H */