fix warnings - remove variables no longer needed

[citadel.git] / citadel / serv_extensions.h

diff --git a/citadel/serv_extensions.h b/citadel/serv_extensions.h
index 8591737ae9ede824231639d3c38a50a6545914a4..95f9640335fbc69291385968ee1c75cde731d8a9 100644 (file)
--- a/citadel/serv_extensions.h
+++ b/citadel/serv_extensions.h
@@ -20,15 +20,38 @@ typedef void (*CtdlDbgFunction) (const int);
 extern int DebugModules;
 #define MDBGLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (DebugModules != 0))
 
-#define MOD_syslog(LEVEL, FORMAT, ...)                         \
+#define MOD_syslog(LEVEL, FORMAT, ...)                                 \
+       MDBGLOG(LEVEL) syslog(LEVEL,                                    \
+                             "%s Modules: " FORMAT, IOSTR, __VA_ARGS__)
+
+#define MODM_syslog(LEVEL, FORMAT)                             \
        MDBGLOG(LEVEL) syslog(LEVEL,                            \
-                             "Modules: " FORMAT, __VA_ARGS__)
+                             "%s Modules: " FORMAT, IOSTR);
+
+
+extern int EnableMarkers;
+#define MARKLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (EnableMarkers != 0))
+
+#define MARK_syslog(LEVEL, FORMAT, ...)                                        \
+       MARKLOG(LEVEL) syslog(LEVEL,                                    \
+                             "%s: " FORMAT, IOSTR, __VA_ARGS__)
 
-#define MODM_syslog(LEVEL, FORMAT)                     \
-       MDBGLOG(LEVEL) syslog(LEVEL,                    \
-                             "Modules: " FORMAT);
+#define MARKM_syslog(LEVEL, FORMAT)                            \
+       MARKLOG(LEVEL) syslog(LEVEL,                            \
+                              "%s: " FORMAT, IOSTR);
 
 
+extern int EnableCtlProto;
+#define CTDLLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (EnableCtlProto != 0))
+
+#define CTDL_syslog(LEVEL, FORMAT, ...)                                        \
+       CTDLLOG(LEVEL) syslog(LEVEL,                                    \
+                             "%s CC[%d]: " FORMAT, IOSTR, CCCID, __VA_ARGS__)
+
+#define CTDLM_syslog(LEVEL, FORMAT)                            \
+       CTDLLOG(LEVEL) syslog(LEVEL,                            \
+                             "%s CC[%d]: " FORMAT, IOSTR, CCCID);
+
 
 
 /*
@@ -111,4 +134,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 */