More syslog and style cleanup

[citadel.git] / citadel / serv_extensions.h

diff --git a/citadel/serv_extensions.h b/citadel/serv_extensions.h
index de8502648f6ea42295aca05056841cd0e5dae60d..b394a0cef1a7eaba2f97ddacec5c7d3205b29113 100644 (file)
--- a/citadel/serv_extensions.h
+++ b/citadel/serv_extensions.h
@@ -17,17 +17,6 @@
 
 typedef void (*CtdlDbgFunction) (const int);
 
-extern int DebugModules;
-#define MDBGLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (DebugModules != 0))
-
-#define MOD_syslog(LEVEL, FORMAT, ...)                         \
-       MDBGLOG(LEVEL) syslog(LEVEL,                            \
-                             "Modules: " FORMAT, __VA_ARGS__)
-
-#define MODM_syslog(LEVEL, FORMAT)                     \
-       MDBGLOG(LEVEL) syslog(LEVEL,                    \
-                             "Modules: " FORMAT);
-
 
 
 
@@ -56,6 +45,13 @@ struct CleanupFunctionHook {
 extern CleanupFunctionHook *CleanupHookTable;
 
 
+typedef struct __LogDebugEntry {
+       CtdlDbgFunction F;
+       const char *Name;
+       long Len;
+       const int *LogP;
+} LogDebugEntry;
+extern HashList *LogDebugEntryTable;
 void initialize_server_extensions(void);
 int DLoader_Exec_Cmd(char *cmdbuf);
 char *Dynamic_Module_Init(void);
@@ -63,9 +59,6 @@ char *Dynamic_Module_Init(void);
 void CtdlDestroySessionHooks(void);
 void PerformSessionHooks(int EventType);
 
-int CheckTDAPVeto (int DBType, StrBuf *ErrMsg);
-void CtdlDestroyTDAPVetoHooks(void);
-
 void CtdlDestroyUserHooks(void);
 void PerformUserHooks(struct ctdluser *usbuf, int EventType);
 
@@ -75,7 +68,7 @@ void CtdlDestroyXmsgHooks(void);
 
 
 void CtdlDestroyMessageHook(void);
-int PerformMessageHooks(struct CtdlMessage *, int EventType);
+int PerformMessageHooks(struct CtdlMessage *, recptypes *recps, int EventType);
 
 
 void CtdlDestroyNetprocHooks(void);
@@ -104,4 +97,6 @@ void CtdlRegisterDebugFlagHook(const char *Name, long len, CtdlDbgFunction F, co
 void CtdlSetDebugLogFacilities(const char **Str, long n);
 void CtdlDestroyDebugTable(void);
 
+void netcfg_keyname(char *keybuf, long roomnum);
+
 #endif /* SERV_EXTENSIONS_H */