Upsie, usleep is 10^6 times smaller than sleep

[citadel.git] / citadel / msgbase.h

diff --git a/citadel/msgbase.h b/citadel/msgbase.h
index f33cbb44acabcbd73157c52d17f2b9a5b547a1b6..2dda8dd0dbb74dcdbc6b45d4ded81a204d257aa6 100644 (file)
--- a/citadel/msgbase.h
+++ b/citadel/msgbase.h
@@ -111,7 +111,26 @@ void cmd_dlat (char *cmdbuf);
 long send_message (struct CtdlMessage *);
 void loadtroom (void);
 long CtdlSubmitMsg(struct CtdlMessage *, struct recptypes *, const char *, int);
-void quickie_message (const char *, const char *, char *, char *, const char *, int, const char *);
+
+void quickie_message(const char *from,
+                    const char *fromaddr,
+                    char *to,
+                    char *room,
+                    const char *text, 
+                    int format_type,
+                    const char *subject);
+
+void flood_protect_quickie_message(const char *from,
+                                  const char *fromaddr,
+                                  char *to,
+                                  char *room,
+                                  const char *text, 
+                                  int format_type,
+                                  const char *subject,
+                                  int nCriterions,
+                                  const char **CritStr,
+                                  long *CritStrLen);
+
 void cmd_ent0 (char *entargs);
 void cmd_dele (char *delstr);
 void cmd_move (char *args);
@@ -234,14 +253,6 @@ struct CtdlMessage *CtdlMakeMessage(
 int CtdlCheckInternetMailPermission(struct ctdluser *who);
 int CtdlIsMe(char *addr, int addr_buf_len);
 
-/*
- * Use of aide_message is deprecated.
- * It has been replaced with CtdlAideMessage.
- * All parameters remain the same.
-*/
-void aide_message(char *text, char *subject) __attribute__ ((deprecated));
-
-
 /* 
  * loading messages async via an FD: 
  * add IO->ReadMsg = NewAsyncMsg(...)
@@ -267,12 +278,12 @@ extern int MessageDebugEnabled;
 #define CCCID CCC->cs_pid
 #define MSG_syslog(LEVEL, FORMAT, ...)                 \
        MSGDBGLOG(LEVEL) syslog(LEVEL,                  \
-                               "CC[%d]" FORMAT,        \
+                               "CC[%d]MSG" FORMAT,     \
                                CCCID, __VA_ARGS__)
 
 #define MSGM_syslog(LEVEL, FORMAT)                     \
        MSGDBGLOG(LEVEL) syslog(LEVEL,                  \
-                               "CC[%d]" FORMAT,        \
+                               "CC[%d]MSG" FORMAT,     \
                                CCCID)