more moving to new logging standard

[citadel.git] / citadel / msgbase.h

diff --git a/citadel/msgbase.h b/citadel/msgbase.h
index 4b53032eb75157e727d2b9bfcdcef85c9246f23b..bdd175991dfc0b159e667bf4edb5019c9ba7e0a6 100644 (file)
--- a/citadel/msgbase.h
+++ b/citadel/msgbase.h
@@ -18,7 +18,9 @@ enum {
 enum {
        MSG_HDRS_BRIEF = 0,
        MSG_HDRS_ALL = 1,
-       MSG_HDRS_EUID = 4
+       MSG_HDRS_EUID = 4,
+       MSG_HDRS_BRIEFFILTER = 8,
+       MSG_HDRS_THREADS = 9
 };
 
 /*
@@ -73,19 +75,16 @@ struct addresses_to_be_filed {
 
 extern struct addresses_to_be_filed *atbf;
 
+int GetFieldFromMnemonic(eMsgField *f, const char* c);
+
+
 void memfmout (char *mptr, const char *nl);
 void output_mime_parts(char *);
 long send_message (struct CtdlMessage *);
 void loadtroom (void);
 long CtdlSubmitMsg(struct CtdlMessage *, recptypes *, const char *, int);
 
-void quickie_message(const char *from,
-                    const char *fromaddr,
-                    const char *to,
-                    char *room,
-                    const char *text, 
-                    int format_type,
-                    const char *subject);
+long quickie_message(const char *from, const char *fromaddr, const char *to, char *room, const char *text, int format_type, const char *subject);
 
 void flood_protect_quickie_message(const char *from,
                                   const char *fromaddr,
@@ -261,19 +260,7 @@ ReadAsyncMsg *NewAsyncMsg(const char *terminator,  /* token signalling EOT */
 eReadState CtdlReadMessageBodyAsync(AsyncIO *IO);
 void DeleteAsyncMsg(ReadAsyncMsg **Msg);
 
-extern int MessageDebugEnabled;
-
-#define MSGDBGLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (MessageDebugEnabled != 0))
-#define CCCID CCC->cs_pid
-#define MSG_syslog(LEVEL, FORMAT, ...)                 \
-       MSGDBGLOG(LEVEL) syslog(LEVEL,                  \
-                               "CC[%d]MSG " FORMAT,    \
-                               CCCID, __VA_ARGS__)
 
-#define MSGM_syslog(LEVEL, FORMAT)                     \
-       MSGDBGLOG(LEVEL) syslog(LEVEL,                  \
-                               "CC[%d]MSG " FORMAT,    \
-                               CCCID)