* Renamed "struct user" to "struct ctdluser"

[citadel.git] / citadel / msgbase.h

diff --git a/citadel/msgbase.h b/citadel/msgbase.h
index f902a40480e09d5a8a5c6e6de1d8b33aaf7f4714..41236b8639d48404f6aa932c12623fed6af9a90a 100644 (file)
--- a/citadel/msgbase.h
+++ b/citadel/msgbase.h
@@ -99,7 +99,7 @@ int CtdlForEachMessage(int mode, long ref,
                         void (*CallBack) (long, void *),
                        void *userdata);
 int CtdlDeleteMessages(char *, long, char *);
-void CtdlWriteObject(char *, char *, char *, struct usersupp *,
+void CtdlWriteObject(char *, char *, char *, struct ctdluser *,
                        int, int, unsigned int);
 struct CtdlMessage *CtdlFetchMessage(long msgnum);
 void CtdlFreeMessage(struct CtdlMessage *msg);
@@ -107,7 +107,7 @@ void serialize_message(struct ser_ret *, struct CtdlMessage *);
 int is_valid_message(struct CtdlMessage *);
 int ReplicationChecks(struct CtdlMessage *);
 int CtdlSaveMsgPointerInRoom(char *roomname, long msgid, int flags);
-char *CtdlReadMessageBody(char *terminator, size_t maxlen, char *exist);
+char *CtdlReadMessageBody(char *terminator, size_t maxlen, char *exist, int crlf);
 char *CtdlGetSysConfig(char *sysconfname);
 void CtdlPutSysConfig(char *sysconfname, char *sysconfdata);
 int CtdlOutputMsg(long msg_num,                /* message number (local) to fetch */
@@ -128,7 +128,7 @@ void CtdlSetSeen(long target_msgnum, int target_setting);
 struct recptypes *validate_recipients(char *recipients);
 void CtdlGetSeen(char *buf);
 struct CtdlMessage *CtdlMakeMessage(
-        struct usersupp *author,        /* author's usersupp structure */
+        struct ctdluser *author,        /* author's user structure */
         char *recipient,                /* NULL if it's not mail */
         char *room,                     /* room where it's going */
         int type,                       /* see MES_ types in header file */
@@ -137,5 +137,5 @@ struct CtdlMessage *CtdlMakeMessage(
         char *subject,                  /* Subject (optional) */
         char *preformatted_text         /* ...or NULL to read text from client */
 );
-int CtdlCheckInternetMailPermission(struct usersupp *who);
+int CtdlCheckInternetMailPermission(struct ctdluser *who);
 int CtdlIsMe(char *addr);