* Renamed "struct user" to "struct ctdluser"

* Renamed "struct room" to "struct ctdlroom"

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 4d9eb74e4013ca639d71242b83f09537a8290af2..43d40da19f06353cecac7d1d204c530a295caf86 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,8 @@
  $Log$
+ Revision 607.15  2003/06/29 19:54:39  ajc
+ * Renamed "struct user" to "struct ctdluser"
+ * Renamed "struct room" to "struct ctdlroom"
+
  Revision 607.14  2003/06/29 04:13:32  ajc
  * Renamed:
    S_QUICKROOM to S_ROOMS
@@ -4822,3 +4826,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
+

diff --git a/citadel/citadel.c b/citadel/citadel.c
index a0457670ff7d9a2843353b8630fb416ed02a3eec..338f10bcdb2d66250c4ca74f2ae945afbc40feb2 100644 (file)
--- a/citadel/citadel.c
+++ b/citadel/citadel.c
@@ -1001,7 +1001,7 @@ int main(int argc, char **argv)
        int stored_password = 0;
        char password[SIZ];
        struct ctdlipcmisc chek;
-       struct user *myself = NULL;
+       struct ctdluser *myself = NULL;
        CtdlIPC* ipc;                   /* Our server connection */
        int r;                          /* IPC result code */
 

diff --git a/citadel/citadel.h b/citadel/citadel.h
index 814cf2c3d88c5febfd4c6c92b28f8b31a704ea2c..3e970484b7b390651e664e6ca223ff369d585313 100644 (file)
--- a/citadel/citadel.h
+++ b/citadel/citadel.h
@@ -158,7 +158,7 @@ struct march {
 /*
  * User records.
  */
-struct user {                  /* User record                      */
+struct ctdluser {                      /* User record                      */
        int version;                    /* Cit vers. which created this rec */
        uid_t uid;                      /* Associate with a unix account?   */
        char password[32];              /* password (for BBS-only users)    */
@@ -195,7 +195,7 @@ struct CitControl {
 /*
  * Room records.
  */
-struct room {
+struct ctdlroom {
        char QRname[ROOMNAMELEN];       /* Name of room                     */
        char QRpasswd[10];              /* Only valid if it's a private rm  */
        long QRroomaide;                /* User number of room aide         */

diff --git a/citadel/citadel_ipc.c b/citadel/citadel_ipc.c
index 49353a6e4a6caf35643c1909e0a84902e962e9ff..f69d4be05f751864ab304068265daa89f0a86f2a 100644 (file)
--- a/citadel/citadel_ipc.c
+++ b/citadel/citadel_ipc.c
@@ -328,14 +328,14 @@ int CtdlIPCKnownRooms(CtdlIPC *ipc, enum RoomList which, int floor, struct march
 
 
 /* GETU */
-/* Caller must free the struct user; caller may pass an existing one */
-int CtdlIPCGetConfig(CtdlIPC *ipc, struct user **uret, char *cret)
+/* Caller must free the struct ctdluser; caller may pass an existing one */
+int CtdlIPCGetConfig(CtdlIPC *ipc, struct ctdluser **uret, char *cret)
 {
        register int ret;
 
        if (!cret) return -2;
        if (!uret) return -2;
-       if (!*uret) *uret = (struct user *)calloc(1, sizeof (struct user));
+       if (!*uret) *uret = (struct ctdluser *)calloc(1, sizeof (struct ctdluser));
        if (!*uret) return -1;
 
        ret = CtdlIPCGenericCommand(ipc, "GETU", NULL, 0, NULL, NULL, cret);
@@ -349,7 +349,7 @@ int CtdlIPCGetConfig(CtdlIPC *ipc, struct user **uret, char *cret)
 
 
 /* SETU */
-int CtdlIPCSetConfig(CtdlIPC *ipc, struct user *uret, char *cret)
+int CtdlIPCSetConfig(CtdlIPC *ipc, struct ctdluser *uret, char *cret)
 {
        char aaa[48];
 
@@ -736,13 +736,13 @@ int CtdlIPCKickoutUserFromRoom(CtdlIPC *ipc, const char *username, char *cret)
 
 
 /* GETR */
-int CtdlIPCGetRoomAttributes(CtdlIPC *ipc, struct room **qret, char *cret)
+int CtdlIPCGetRoomAttributes(CtdlIPC *ipc, struct ctdlroom **qret, char *cret)
 {
        register int ret;
 
        if (!cret) return -2;
        if (!qret) return -2;
-       if (!*qret) *qret = (struct room *)calloc(1, sizeof (struct room));
+       if (!*qret) *qret = (struct ctdlroom *)calloc(1, sizeof (struct ctdlroom));
        if (!*qret) return -1;
 
        ret = CtdlIPCGenericCommand(ipc, "GETR", NULL, 0, NULL, NULL, cret);
@@ -762,7 +762,7 @@ int CtdlIPCGetRoomAttributes(CtdlIPC *ipc, struct room **qret, char *cret)
 
 /* SETR */
 /* set forget to kick all users out of room */
-int CtdlIPCSetRoomAttributes(CtdlIPC *ipc, int forget, struct room *qret, char *cret)
+int CtdlIPCSetRoomAttributes(CtdlIPC *ipc, int forget, struct ctdlroom *qret, char *cret)
 {
        register int ret;
        char *aaa;
@@ -1663,14 +1663,14 @@ time_t CtdlIPCServerTime(CtdlIPC *ipc, char *cret)
 
 /* AGUP */
 int CtdlIPCAideGetUserParameters(CtdlIPC *ipc, const char *who,
-                                struct user **uret, char *cret)
+                                struct ctdluser **uret, char *cret)
 {
        register int ret;
        char aaa[SIZ];
 
        if (!cret) return -2;
        if (!uret) return -2;
-       if (!*uret) *uret = (struct user *)calloc(1, sizeof(struct user));
+       if (!*uret) *uret = (struct ctdluser *)calloc(1, sizeof(struct ctdluser));
        if (!*uret) return -1;
 
        sprintf(aaa, "AGUP %s", who);
@@ -1692,7 +1692,7 @@ int CtdlIPCAideGetUserParameters(CtdlIPC *ipc, const char *who,
 
 
 /* ASUP */
-int CtdlIPCAideSetUserParameters(CtdlIPC *ipc, const struct user *uret, char *cret)
+int CtdlIPCAideSetUserParameters(CtdlIPC *ipc, const struct ctdluser *uret, char *cret)
 {
        register int ret;
        char *aaa;

diff --git a/citadel/citadel_ipc.h b/citadel/citadel_ipc.h
index d1083f604797d80c8b1a416c16c34a6ed57b9caf..df0f90e9817c50bfdfa078bfbdd457fc9c2821c3 100644 (file)
--- a/citadel/citadel_ipc.h
+++ b/citadel/citadel_ipc.h
@@ -164,8 +164,8 @@ int CtdlIPCCreateUser(CtdlIPC *ipc, const char *username, int selfservice,
 int CtdlIPCChangePassword(CtdlIPC *ipc, const char *passwd, char *cret);
 int CtdlIPCKnownRooms(CtdlIPC *ipc, enum RoomList which, int floor,
                struct march **listing, char *cret);
-int CtdlIPCGetConfig(CtdlIPC *ipc, struct user **uret, char *cret);
-int CtdlIPCSetConfig(CtdlIPC *ipc, struct user *uret, char *cret);
+int CtdlIPCGetConfig(CtdlIPC *ipc, struct ctdluser **uret, char *cret);
+int CtdlIPCSetConfig(CtdlIPC *ipc, struct ctdluser *uret, char *cret);
 int CtdlIPCGotoRoom(CtdlIPC *ipc, const char *room, const char *passwd,
                struct ctdlipcroom **rret, char *cret);
 int CtdlIPCGetMessages(CtdlIPC *ipc, enum MessageList which, int whicharg,
@@ -179,8 +179,8 @@ int CtdlIPCReadDirectory(CtdlIPC *ipc, char **listing, char *cret);
 int CtdlIPCSetLastRead(CtdlIPC *ipc, long msgnum, char *cret);
 int CtdlIPCInviteUserToRoom(CtdlIPC *ipc, const char *username, char *cret);
 int CtdlIPCKickoutUserFromRoom(CtdlIPC *ipc, const char *username, char *cret);
-int CtdlIPCGetRoomAttributes(CtdlIPC *ipc, struct room **qret, char *cret);
-int CtdlIPCSetRoomAttributes(CtdlIPC *ipc, int forget, struct room *qret,
+int CtdlIPCGetRoomAttributes(CtdlIPC *ipc, struct ctdlroom **qret, char *cret);
+int CtdlIPCSetRoomAttributes(CtdlIPC *ipc, int forget, struct ctdlroom *qret,
                char *cret);
 int CtdlIPCGetRoomAide(CtdlIPC *ipc, char *cret);
 int CtdlIPCSetRoomAide(CtdlIPC *ipc, const char *username, char *cret);
@@ -260,8 +260,8 @@ int CtdlIPCChangeRoomname(CtdlIPC *ipc, const char *roomname, char *cret);
 int CtdlIPCChangeUsername(CtdlIPC *ipc, const char *username, char *cret);
 time_t CtdlIPCServerTime(CtdlIPC *ipc, char *crert);
 int CtdlIPCAideGetUserParameters(CtdlIPC *ipc, const char *who,
-                                struct user **uret, char *cret);
-int CtdlIPCAideSetUserParameters(CtdlIPC *ipc, const struct user *uret, char *cret);
+                                struct ctdluser **uret, char *cret);
+int CtdlIPCAideSetUserParameters(CtdlIPC *ipc, const struct ctdluser *uret, char *cret);
 int CtdlIPCGetMessageExpirationPolicy(CtdlIPC *ipc, int which,
                struct ExpirePolicy **policy, char *cret);
 int CtdlIPCSetMessageExpirationPolicy(CtdlIPC *ipc, int which,

diff --git a/citadel/citserver.c b/citadel/citserver.c
index ec01ebd4047d6db95ed21e4401c2c9013dbbe531..8ea2441fafb9b1a1f5833518937dcfa3485226f8 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -71,7 +71,7 @@ time_t server_startup_time;
  */
 void master_startup(void) {
        struct timeval tv;
-       struct room qrbuf;
+       struct ctdlroom qrbuf;
        
        lprintf(9, "master_startup() started\n");
        time(&server_startup_time);

diff --git a/citadel/file_ops.c b/citadel/file_ops.c
index 7725507cd6585200c93e9e947bb28d385b649e59..f45099e39277aad679d4e728d2c544b4864ff605 100644 (file)
--- a/citadel/file_ops.c
+++ b/citadel/file_ops.c
@@ -162,7 +162,7 @@ void cmd_movf(char *cmdbuf)
        char newroom[SIZ];
        char buf[SIZ];
        int a;
-       struct room qrbuf;
+       struct ctdlroom qrbuf;
 
        extract(filename, cmdbuf, 0);
        extract(newroom, cmdbuf, 1);
@@ -393,7 +393,7 @@ void cmd_oimg(char *cmdbuf)
 {
        char filename[SIZ];
        char pathname[SIZ];
-       struct user usbuf;
+       struct ctdluser usbuf;
        char which_user[USERNAME_SIZE];
        int which_floor;
        int a;

diff --git a/citadel/housekeeping.c b/citadel/housekeeping.c
index 09dbad4eb143aca6d3b3fb76b22dcb9706d6823c..55d40e3d1ce5bae468b9346d7749d990405b6547 100644 (file)
--- a/citadel/housekeeping.c
+++ b/citadel/housekeeping.c
@@ -92,7 +92,7 @@ void check_sched_shutdown(void) {
  * NOTE: this function pair should ONLY be called during startup.  It is NOT
  * thread safe.
  */
-void check_ref_counts_backend(struct room *qrbuf, void *data) {
+void check_ref_counts_backend(struct ctdlroom *qrbuf, void *data) {
        struct floor flbuf;
 
        getfloor(&flbuf, qrbuf->QRfloor);

diff --git a/citadel/imap_tools.c b/citadel/imap_tools.c
index f0299f3bea104cf16b94c3195c141d84bf27ca62..87f145f4745ba3758a3e5dedf95d57aad340e88d 100644 (file)
--- a/citadel/imap_tools.c
+++ b/citadel/imap_tools.c
@@ -89,9 +89,9 @@ int imap_parameterize(char **args, char *buf)
 }
 
 /*
- * Convert a struct room to an IMAP-compatible mailbox name.
+ * Convert a struct ctdlroom to an IMAP-compatible mailbox name.
  */
-void imap_mailboxname(char *buf, int bufsize, struct room *qrbuf)
+void imap_mailboxname(char *buf, int bufsize, struct ctdlroom *qrbuf)
 {
        struct floor *fl;
        int i;

diff --git a/citadel/imap_tools.h b/citadel/imap_tools.h
index d679074c2c128d1882771500df5d024df0271e68..872adffcab4a681b66e13b9ce2ce05e349279685 100644 (file)
--- a/citadel/imap_tools.h
+++ b/citadel/imap_tools.h
@@ -15,7 +15,7 @@
 
 void imap_strout(char *buf);
 int imap_parameterize(char **args, char *buf);
-void imap_mailboxname(char *buf, int bufsize, struct room *qrbuf);
+void imap_mailboxname(char *buf, int bufsize, struct ctdlroom *qrbuf);
 void imap_ial_out(struct internet_address_list *ialist);
 int imap_roomname(char *buf, int bufsize, char *foldername);
 int imap_is_message_set(char *);

diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c
index 731c12079fae0cbecafc76d814f67048b3c2b4d4..50da226926d6515b14c3ebc0855138fc31094cd3 100644 (file)
--- a/citadel/internet_addressing.c
+++ b/citadel/internet_addressing.c
@@ -113,7 +113,7 @@ int CtdlHostAlias(char *fqdn) {
  *
  * FIXME ... this needs to be updated to handle aliases.
  */
-int fuzzy_match(struct user *us, char *matchstring) {
+int fuzzy_match(struct ctdluser *us, char *matchstring) {
        int a;
 
        if ( (!strncasecmp(matchstring, "cit", 3)) 

diff --git a/citadel/internet_addressing.h b/citadel/internet_addressing.h
index c072fceeb556c50fe365686b8e121ec45c51cbd5..c63ec94cc6d272fc515ea726e2592fca4eb82436 100644 (file)
--- a/citadel/internet_addressing.h
+++ b/citadel/internet_addressing.h
@@ -13,7 +13,7 @@ struct internet_address_list {
 };
 
 
-int fuzzy_match(struct user *us, char *matchstring);
+int fuzzy_match(struct ctdluser *us, char *matchstring);
 void process_rfc822_addr(const char *rfc822, char *user, char *node, char *name);
 char *rfc822_fetch_field(char *rfc822, char *fieldname);
 

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index c4f7550575b97ac635f5d77a72a068c01b0327b3..e832cad06691d0af92ec0be4f9ff73c7bc48b6bb 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -1884,7 +1884,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,       /* message to save */
        char recipient[SIZ];
        long newmsgid;
        char *mptr = NULL;
-       struct user userbuf;
+       struct ctdluser userbuf;
        int a, i;
        struct MetaData smi;
        FILE *network_fp = NULL;
@@ -2292,7 +2292,7 @@ char *CtdlReadMessageBody(char *terminator,       /* token signalling EOT */
  */
 
 struct CtdlMessage *CtdlMakeMessage(
-       struct user *author,    /* author's user 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 */
@@ -2407,7 +2407,7 @@ int CtdlDoIHavePermissionToPostInThisRoom(char *errmsgbuf, size_t n) {
  * Check to see if the specified user has Internet mail permission
  * (returns nonzero if permission is granted)
  */
-int CtdlCheckInternetMailPermission(struct user *who) {
+int CtdlCheckInternetMailPermission(struct ctdluser *who) {
 
        /* Globally enabled? */
        if (config.c_restrict == 0) return(1);
@@ -2437,8 +2437,8 @@ struct recptypes *validate_recipients(char *recipients) {
        int i, j;
        int mailtype;
        int invalid;
-       struct user tempUS;
-       struct room tempQR;
+       struct ctdluser tempUS;
+       struct ctdlroom tempQR;
 
        /* Initialize */
        ret = (struct recptypes *) malloc(sizeof(struct recptypes));
@@ -2760,7 +2760,7 @@ int CtdlDeleteMessages(char *room_name,           /* which room */
 )
 {
 
-       struct room qrbuf;
+       struct ctdlroom qrbuf;
        struct cdbdata *cdbfr;
        long *msglist = NULL;
        long *dellist = NULL;
@@ -2909,7 +2909,7 @@ void cmd_move(char *args)
 {
        long num;
        char targ[SIZ];
-       struct room qtemp;
+       struct ctdlroom qtemp;
        int err;
        int is_copy = 0;
 
@@ -3052,7 +3052,7 @@ void AdjRefCount(long msgnum, int incr)
 void CtdlWriteObject(char *req_room,           /* Room to stuff it in */
                        char *content_type,     /* MIME type of this object */
                        char *tempfilename,     /* Where to fetch it from */
-                       struct user *is_mailbox,        /* Mailbox room? */
+                       struct ctdluser *is_mailbox,    /* Mailbox room? */
                        int is_binary,          /* Is encoding necessary? */
                        int is_unique,          /* Del others of this type? */
                        unsigned int flags      /* Internal save flags */
@@ -3060,7 +3060,7 @@ void CtdlWriteObject(char *req_room,              /* Room to stuff it in */
 {
 
        FILE *fp;
-       struct room qrbuf;
+       struct ctdlroom qrbuf;
        char roomname[ROOMNAMELEN];
        struct CtdlMessage *msg;
 

diff --git a/citadel/msgbase.h b/citadel/msgbase.h
index c5a9351b0b2dbacd1423c0506e80129659589d75..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 user *,
+void CtdlWriteObject(char *, char *, char *, struct ctdluser *,
                        int, int, unsigned int);
 struct CtdlMessage *CtdlFetchMessage(long msgnum);
 void CtdlFreeMessage(struct CtdlMessage *msg);
@@ -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 user *author,        /* author's user 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 user *who);
+int CtdlCheckInternetMailPermission(struct ctdluser *who);
 int CtdlIsMe(char *addr);

diff --git a/citadel/policy.c b/citadel/policy.c
index 2ed72622f2fe6e065ef2f67f70a1de78083372d4..621e7a72ad662a5469c31e86e1973209a153cdda 100644 (file)
--- a/citadel/policy.c
+++ b/citadel/policy.c
@@ -44,7 +44,7 @@
 /*
  * Retrieve the applicable expire policy for a specific room
  */
-void GetExpirePolicy(struct ExpirePolicy *epbuf, struct room *qrbuf) {
+void GetExpirePolicy(struct ExpirePolicy *epbuf, struct ctdlroom *qrbuf) {
        struct floor *fl;
 
        /* If the room has its own policy, return it */ 

diff --git a/citadel/policy.h b/citadel/policy.h
index 273d28876893d33e69eb3b20bf1978affbe776e4..65c8bda2fe22e7905af4e7801573766a0f722e62 100644 (file)
--- a/citadel/policy.h
+++ b/citadel/policy.h
@@ -1,4 +1,4 @@
 /* $Id$ */
-void GetExpirePolicy(struct ExpirePolicy *epbuf, struct room *qrbuf);
+void GetExpirePolicy(struct ExpirePolicy *epbuf, struct ctdlroom *qrbuf);
 void cmd_gpex(char *argbuf);
 void cmd_spex(char *argbuf);

diff --git a/citadel/room_ops.c b/citadel/room_ops.c
index 35d8c9a19afacd43fbc67737c1f1f27f8e5e4aab..e2a3310489ff1ff2a7429d1a2f788149f3bb37f6 100644 (file)
--- a/citadel/room_ops.c
+++ b/citadel/room_ops.c
@@ -49,7 +49,7 @@ struct floor *floorcache[MAXFLOORS];
 /*
  * Generic routine for determining user access to rooms
  */
-int CtdlRoomAccess(struct room *roombuf, struct user *userbuf)
+int CtdlRoomAccess(struct ctdlroom *roombuf, struct ctdluser *userbuf)
 {
        int retval = 0;
        struct visit vbuf;
@@ -162,7 +162,7 @@ NEWMSG:     /* By the way, we also check for the presence of new messages */
 /*
  * Self-checking stuff for a room record read into memory
  */
-void room_sanity_check(struct room *qrbuf)
+void room_sanity_check(struct ctdlroom *qrbuf)
 {
        /* Mailbox rooms are always on the lowest floor */
        if (qrbuf->QRflags & QR_MAILBOX) {
@@ -181,7 +181,7 @@ void room_sanity_check(struct room *qrbuf)
 /*
  * getroom()  -  retrieve room data from disk
  */
-int getroom(struct room *qrbuf, char *room_name)
+int getroom(struct ctdlroom *qrbuf, char *room_name)
 {
        struct cdbdata *cdbqr;
        char lowercase_name[ROOMNAMELEN];
@@ -193,7 +193,7 @@ int getroom(struct room *qrbuf, char *room_name)
        }
        lowercase_name[a] = 0;
 
-       memset(qrbuf, 0, sizeof(struct room));
+       memset(qrbuf, 0, sizeof(struct ctdlroom));
 
        /* First, try the public namespace */
        cdbqr = cdb_fetch(CDB_ROOMS,
@@ -210,8 +210,8 @@ int getroom(struct room *qrbuf, char *room_name)
        }
        if (cdbqr != NULL) {
                memcpy(qrbuf, cdbqr->ptr,
-                      ((cdbqr->len > sizeof(struct room)) ?
-                       sizeof(struct room) : cdbqr->len));
+                      ((cdbqr->len > sizeof(struct ctdlroom)) ?
+                       sizeof(struct ctdlroom) : cdbqr->len));
                cdb_free(cdbqr);
 
                room_sanity_check(qrbuf);
@@ -225,7 +225,7 @@ int getroom(struct room *qrbuf, char *room_name)
 /*
  * lgetroom()  -  same as getroom() but locks the record (if supported)
  */
-int lgetroom(struct room *qrbuf, char *room_name)
+int lgetroom(struct ctdlroom *qrbuf, char *room_name)
 {
        register int retval;
        retval = getroom(qrbuf, room_name);
@@ -238,7 +238,7 @@ int lgetroom(struct room *qrbuf, char *room_name)
  * b_putroom()  -  back end to putroom() and b_deleteroom()
  *              (if the supplied buffer is NULL, delete the room record)
  */
-void b_putroom(struct room *qrbuf, char *room_name)
+void b_putroom(struct ctdlroom *qrbuf, char *room_name)
 {
        char lowercase_name[ROOMNAMELEN];
        int a;
@@ -254,7 +254,7 @@ void b_putroom(struct room *qrbuf, char *room_name)
                time(&qrbuf->QRmtime);
                cdb_store(CDB_ROOMS,
                          lowercase_name, strlen(lowercase_name),
-                         qrbuf, sizeof(struct room));
+                         qrbuf, sizeof(struct ctdlroom));
        }
 }
 
@@ -262,7 +262,7 @@ void b_putroom(struct room *qrbuf, char *room_name)
 /* 
  * putroom()  -  store room data to disk
  */
-void putroom(struct room *qrbuf) {
+void putroom(struct ctdlroom *qrbuf) {
        b_putroom(qrbuf, qrbuf->QRname);
 }
 
@@ -279,7 +279,7 @@ void b_deleteroom(char *room_name) {
 /*
  * lputroom()  -  same as putroom() but unlocks the record (if supported)
  */
-void lputroom(struct room *qrbuf)
+void lputroom(struct ctdlroom *qrbuf)
 {
 
        putroom(qrbuf);
@@ -381,19 +381,19 @@ void lputfloor(struct floor *flbuf, int floor_num)
 /* 
  *  Traverse the room file...
  */
-void ForEachRoom(void (*CallBack) (struct room *EachRoom, void *out_data),
+void ForEachRoom(void (*CallBack) (struct ctdlroom *EachRoom, void *out_data),
                void *in_data)
 {
-       struct room qrbuf;
+       struct ctdlroom qrbuf;
        struct cdbdata *cdbqr;
 
        cdb_rewind(CDB_ROOMS);
 
        while (cdbqr = cdb_next_item(CDB_ROOMS), cdbqr != NULL) {
-               memset(&qrbuf, 0, sizeof(struct room));
+               memset(&qrbuf, 0, sizeof(struct ctdlroom));
                memcpy(&qrbuf, cdbqr->ptr,
-                      ((cdbqr->len > sizeof(struct room)) ?
-                       sizeof(struct room) : cdbqr->len));
+                      ((cdbqr->len > sizeof(struct ctdlroom)) ?
+                       sizeof(struct ctdlroom) : cdbqr->len));
                cdb_free(cdbqr);
                room_sanity_check(&qrbuf);
                if (qrbuf.QRflags & QR_INUSE)
@@ -405,7 +405,7 @@ void ForEachRoom(void (*CallBack) (struct room *EachRoom, void *out_data),
 /*
  * delete_msglist()  -  delete room message pointers
  */
-void delete_msglist(struct room *whichroom)
+void delete_msglist(struct ctdlroom *whichroom)
 {
         struct cdbdata *cdbml;
 
@@ -464,7 +464,7 @@ int sort_msglist(long listptrs[], int oldcount)
 /*
  * Determine whether a given room is non-editable.
  */
-int is_noneditable(struct room *qrbuf)
+int is_noneditable(struct ctdlroom *qrbuf)
 {
 
        /* Mail> rooms are non-editable */
@@ -481,7 +481,7 @@ int is_noneditable(struct room *qrbuf)
 /*
  * Back-back-end for all room listing commands
  */
-void list_roomname(struct room *qrbuf, int ra)
+void list_roomname(struct ctdlroom *qrbuf, int ra)
 {
        char truncated_roomname[ROOMNAMELEN];
 
@@ -511,7 +511,7 @@ void list_roomname(struct room *qrbuf, int ra)
 /* 
  * cmd_lrms()   -  List all accessible rooms, known or forgotten
  */
-void cmd_lrms_backend(struct room *qrbuf, void *data)
+void cmd_lrms_backend(struct ctdlroom *qrbuf, void *data)
 {
        int FloorBeingSearched = (-1);
        int ra;
@@ -548,7 +548,7 @@ void cmd_lrms(char *argbuf)
 /* 
  * cmd_lkra()   -  List all known rooms
  */
-void cmd_lkra_backend(struct room *qrbuf, void *data)
+void cmd_lkra_backend(struct ctdlroom *qrbuf, void *data)
 {
        int FloorBeingSearched = (-1);
        int ra;
@@ -582,7 +582,7 @@ void cmd_lkra(char *argbuf)
 
 
 
-void cmd_lprm_backend(struct room *qrbuf, void *data)
+void cmd_lprm_backend(struct ctdlroom *qrbuf, void *data)
 {
        int FloorBeingSearched = (-1);
        int ra;
@@ -614,7 +614,7 @@ void cmd_lprm(char *argbuf)
 /* 
  * cmd_lkrn()   -  List all known rooms with new messages
  */
-void cmd_lkrn_backend(struct room *qrbuf, void *data)
+void cmd_lkrn_backend(struct ctdlroom *qrbuf, void *data)
 {
        int FloorBeingSearched = (-1);
        int ra;
@@ -652,7 +652,7 @@ void cmd_lkrn(char *argbuf)
 /* 
  * cmd_lkro()   -  List all known rooms
  */
-void cmd_lkro_backend(struct room *qrbuf, void *data)
+void cmd_lkro_backend(struct ctdlroom *qrbuf, void *data)
 {
        int FloorBeingSearched = (-1);
        int ra;
@@ -690,7 +690,7 @@ void cmd_lkro(char *argbuf)
 /* 
  * cmd_lzrm()   -  List all forgotten rooms
  */
-void cmd_lzrm_backend(struct room *qrbuf, void *data)
+void cmd_lzrm_backend(struct ctdlroom *qrbuf, void *data)
 {
        int FloorBeingSearched = (-1);
 
@@ -848,7 +848,7 @@ void usergoto(char *where, int display_result, int transiently,
  */
 void cmd_goto(char *gargs)
 {
-       struct room QRscratch;
+       struct ctdlroom QRscratch;
        int c;
        int ok = 0;
        int ra;
@@ -893,7 +893,7 @@ void cmd_goto(char *gargs)
                /* Let internal programs go directly to any room. */
                if (CC->internal_pgm) {
                        memcpy(&CC->room, &QRscratch,
-                               sizeof(struct room));
+                               sizeof(struct ctdlroom));
                        usergoto(NULL, 1, transiently, NULL, NULL);
                        return;
                }
@@ -910,7 +910,7 @@ void cmd_goto(char *gargs)
                        if ((QRscratch.QRflags & QR_MAILBOX) &&
                            ((ra & UA_GOTOALLOWED))) {
                                memcpy(&CC->room, &QRscratch,
-                                       sizeof(struct room));
+                                       sizeof(struct ctdlroom));
                                usergoto(NULL, 1, transiently, NULL, NULL);
                                return;
                        } else if ((QRscratch.QRflags & QR_PASSWORDED) &&
@@ -931,7 +931,7 @@ void cmd_goto(char *gargs)
                                goto NOPE;
                        } else {
                                memcpy(&CC->room, &QRscratch,
-                                       sizeof(struct room));
+                                       sizeof(struct ctdlroom));
                                usergoto(NULL, 1, transiently, NULL, NULL);
                                return;
                        }
@@ -944,7 +944,7 @@ NOPE:       cprintf("%d room '%s' not found\n", ERROR + ROOM_NOT_FOUND, towhere);
 
 void cmd_whok(void)
 {
-       struct user temp;
+       struct ctdluser temp;
        struct cdbdata *cdbus;
 
        getuser(&CC->user, CC->curr_user);
@@ -1087,8 +1087,8 @@ void cmd_getr(void)
  */
 int CtdlRenameRoom(char *old_name, char *new_name, int new_floor) {
        int old_floor = 0;
-       struct room qrbuf;
-       struct room qrtmp;
+       struct ctdlroom qrbuf;
+       struct ctdlroom qrtmp;
        int ret = 0;
        struct floor *fl;
        struct floor flbuf;
@@ -1343,7 +1343,7 @@ void cmd_setr(char *args)
  */
 void cmd_geta(void)
 {
-       struct user usbuf;
+       struct ctdluser usbuf;
 
        if (CtdlAccessCheck(ac_logged_in)) return;
 
@@ -1360,7 +1360,7 @@ void cmd_geta(void)
  */
 void cmd_seta(char *new_ra)
 {
-       struct user usbuf;
+       struct ctdluser usbuf;
        long newu;
        char buf[SIZ];
        int post_notice;
@@ -1403,7 +1403,7 @@ void cmd_seta(char *new_ra)
  * Generate an associated file name for a room
  */
 void assoc_file_name(char *buf, size_t n,
-                    struct room *qrbuf, const char *prefix)
+                    struct ctdlroom *qrbuf, const char *prefix)
 {
        snprintf(buf, n, "./%s/%ld", prefix, qrbuf->QRnumber);
 }
@@ -1437,7 +1437,7 @@ void cmd_rinf(void)
 /*
  * Back end processing to delete a room and everything associated with it
  */
-void delete_room(struct room *qrbuf)
+void delete_room(struct ctdlroom *qrbuf)
 {
        struct floor flbuf;
        char filename[100];
@@ -1480,7 +1480,7 @@ void delete_room(struct room *qrbuf)
 /*
  * Check access control for deleting a room
  */
-int CtdlDoIHavePermissionToDeleteThisRoom(struct room *qr) {
+int CtdlDoIHavePermissionToDeleteThisRoom(struct ctdlroom *qr) {
 
        if ((!(CC->logged_in)) && (!(CC->internal_pgm))) {
                return(0);
@@ -1568,7 +1568,7 @@ unsigned create_room(char *new_room_name,
                     int avoid_access)
 {
 
-       struct room qrbuf;
+       struct ctdlroom qrbuf;
        struct floor flbuf;
        struct visit vbuf;
 
@@ -1579,7 +1579,7 @@ unsigned create_room(char *new_room_name,
        }
 
 
-       memset(&qrbuf, 0, sizeof(struct room));
+       memset(&qrbuf, 0, sizeof(struct ctdlroom));
        safestrncpy(qrbuf.QRpasswd, new_room_pass, sizeof qrbuf.QRpasswd);
        qrbuf.QRflags = QR_INUSE;
        if (new_room_type > 0)

diff --git a/citadel/room_ops.h b/citadel/room_ops.h
index 4526389b34eaffd022b9145bf3d884ef71c68575..588747c7464731449cd2b53d7e848beacd008c03 100644 (file)
--- a/citadel/room_ops.h
+++ b/citadel/room_ops.h
@@ -1,16 +1,16 @@
 /* $Id$ */
-int is_known (struct room *roombuf, int roomnum,
-             struct user *userbuf);
-int has_newmsgs (struct room *roombuf, int roomnum,
-                struct user *userbuf);
-int is_zapped (struct room *roombuf, int roomnum,
-              struct user *userbuf);
-int getroom(struct room *qrbuf, char *room_name);
-void b_putroom(struct room *qrbuf, char *room_name);
-void putroom(struct room *);
+int is_known (struct ctdlroom *roombuf, int roomnum,
+             struct ctdluser *userbuf);
+int has_newmsgs (struct ctdlroom *roombuf, int roomnum,
+                struct ctdluser *userbuf);
+int is_zapped (struct ctdlroom *roombuf, int roomnum,
+              struct ctdluser *userbuf);
+int getroom(struct ctdlroom *qrbuf, char *room_name);
+void b_putroom(struct ctdlroom *qrbuf, char *room_name);
+void putroom(struct ctdlroom *);
 void b_deleteroom(char *);
-int lgetroom(struct room *qrbuf, char *room_name);
-void lputroom(struct room *qrbuf);
+int lgetroom(struct ctdlroom *qrbuf, char *room_name);
+void lputroom(struct ctdlroom *qrbuf);
 void getfloor (struct floor *flbuf, int floor_num);
 struct floor *cgetfloor(int floor_num);
 void lgetfloor (struct floor *flbuf, int floor_num);
@@ -46,15 +46,15 @@ void cmd_lflr (void);
 void cmd_cflr (char *argbuf);
 void cmd_kflr (char *argbuf);
 void cmd_eflr (char *argbuf);
-void ForEachRoom(void (*CallBack)(struct room *EachRoom, void *out_data),
+void ForEachRoom(void (*CallBack)(struct ctdlroom *EachRoom, void *out_data),
        void *in_data);
 void assoc_file_name(char *buf, size_t n,
-                    struct room *qrbuf, const char *prefix);
-void delete_room(struct room *qrbuf);
-void list_roomname(struct room *qrbuf, int ra);
-int is_noneditable(struct room *qrbuf);
-int CtdlRoomAccess(struct room *roombuf, struct user *userbuf);
-int CtdlDoIHavePermissionToDeleteThisRoom(struct room *qr);
+                    struct ctdlroom *qrbuf, const char *prefix);
+void delete_room(struct ctdlroom *qrbuf);
+void list_roomname(struct ctdlroom *qrbuf, int ra);
+int is_noneditable(struct ctdlroom *qrbuf);
+int CtdlRoomAccess(struct ctdlroom *roombuf, struct ctdluser *userbuf);
+int CtdlDoIHavePermissionToDeleteThisRoom(struct ctdlroom *qr);
 
 int CtdlRenameRoom(char *old_name, char *new_name, int new_floor);
 /*

diff --git a/citadel/rooms.c b/citadel/rooms.c
index 4790107433b6f7bf0a12a306f6849e9f798055fa..eac37b0161c03d50f8b3e83dc34520b245dcfede 100644 (file)
--- a/citadel/rooms.c
+++ b/citadel/rooms.c
@@ -88,7 +88,7 @@ void load_floorlist(CtdlIPC *ipc)
 }
 
 
-void room_tree_list(struct roomlisting *rp)
+void room_tree_list(struct ctdlroomlisting *rp)
 {
        static int c = 0;
        char rmname[ROOMNAMELEN];
@@ -142,7 +142,7 @@ void room_tree_list(struct roomlisting *rp)
 /* 
  * Room ordering stuff (compare first by floor, then by order)
  */
-int rordercmp(struct roomlisting *r1, struct roomlisting *r2)
+int rordercmp(struct ctdlroomlisting *r1, struct ctdlroomlisting *r2)
 {
        if ((r1 == NULL) && (r2 == NULL))
                return (0);
@@ -168,9 +168,9 @@ int rordercmp(struct roomlisting *r1, struct roomlisting *r2)
 static void listrms(struct march *listing, int new_only, int floor_only)
 {
        struct march *mptr;
-       struct roomlisting *rl = NULL;
-       struct roomlisting *rp;
-       struct roomlisting *rs;
+       struct ctdlroomlisting *rl = NULL;
+       struct ctdlroomlisting *rp;
+       struct ctdlroomlisting *rs;
        int list_it;
 
        for (mptr = listing; mptr != NULL; mptr = mptr->next) {
@@ -189,7 +189,7 @@ static void listrms(struct march *listing, int new_only, int floor_only)
                        list_it = 0;
 
                if (list_it) {
-                       rp = malloc(sizeof(struct roomlisting));
+                       rp = malloc(sizeof(struct ctdlroomlisting));
                        strncpy(rp->rlname, mptr->march_name, ROOMNAMELEN);
                        rp->rlflags = mptr->march_flags;
                        rp->rlfloor = mptr->march_floor;
@@ -429,7 +429,7 @@ void editthisroom(CtdlIPC *ipc)
        int rbump = 0;
        char raide[USERNAME_SIZE];
        char buf[SIZ];
-       struct room *attr = NULL;
+       struct ctdlroom *attr = NULL;
        struct ExpirePolicy *eptr = NULL;
        int r;                          /* IPC response code */
 

diff --git a/citadel/rooms.h b/citadel/rooms.h
index fdfe71e2d3efbb469dd2943c8b1757fb01a69db7..a103a052ddcffae88dd7da2fcbe04bb85cd51036 100644 (file)
--- a/citadel/rooms.h
+++ b/citadel/rooms.h
@@ -31,9 +31,9 @@ void do_edit(CtdlIPC *ipc,
  * This struct holds a list of rooms for client display.
  * (oooh, a tree!)
  */
-struct roomlisting {
-        struct roomlisting *lnext;
-       struct roomlisting *rnext;
+struct ctdlroomlisting {
+        struct ctdlroomlisting *lnext;
+       struct ctdlroomlisting *rnext;
         char rlname[ROOMNAMELEN];
         unsigned rlflags;
        int rlfloor;

diff --git a/citadel/routines.c b/citadel/routines.c
index 7bb82394998967c00d41b0655727239ed3c76f2e..cbeaddaf7076db12693cee376d89928524169e5e 100644 (file)
--- a/citadel/routines.c
+++ b/citadel/routines.c
@@ -107,7 +107,7 @@ void edituser(CtdlIPC *ipc)
 {
        char buf[SIZ];
        char who[USERNAME_SIZE];
-       struct user *user = NULL;
+       struct ctdluser *user = NULL;
        int newnow = 0;
        int r;                          /* IPC response code */
 
@@ -204,7 +204,7 @@ int set_attr(CtdlIPC *ipc, unsigned int sval, char *prompt, unsigned int sbit, i
 void enter_config(CtdlIPC *ipc, int mode)
 {
        char buf[SIZ];
-       struct user *user = NULL;
+       struct ctdluser *user = NULL;
        int r;                          /* IPC response code */
 
        r = CtdlIPCGetConfig(ipc, &user, buf);

diff --git a/citadel/serv_bio.c b/citadel/serv_bio.c
index 186bb4bfabebbf47889f69eb73eb1ac5d7f9ce34..cfb23d1083bebe29b6fe6af242c5c0e8c03d5d1a 100644 (file)
--- a/citadel/serv_bio.c
+++ b/citadel/serv_bio.c
@@ -78,7 +78,7 @@ void cmd_ebio(char *cmdbuf) {
  */
 void cmd_rbio(char *cmdbuf)
 {
-       struct user ruser;
+       struct ctdluser ruser;
        char buf[SIZ];
        FILE *fp;
 
@@ -108,7 +108,7 @@ void cmd_rbio(char *cmdbuf)
 void cmd_lbio(char *cmdbuf) {
        char buf[SIZ];
        FILE *ls;
-       struct user usbuf;
+       struct ctdluser usbuf;
 
        ls=popen("cd ./bio; ls","r");
        if (ls==NULL) {

diff --git a/citadel/serv_calendar.c b/citadel/serv_calendar.c
index d0d152cc7909c5a0ea43bc61497f550084b8b821..849eacb70e6fd3f93172c57b9b04719444d09488 100644 (file)
--- a/citadel/serv_calendar.c
+++ b/citadel/serv_calendar.c
@@ -107,7 +107,7 @@ icalcomponent *ical_encapsulate_subcomponent(icalcomponent *subcomp) {
  * 
  * ok
  */
-void ical_write_to_cal(struct user *u, icalcomponent *cal) {
+void ical_write_to_cal(struct ctdluser *u, icalcomponent *cal) {
        char temp[PATH_MAX];
        FILE *fp;
        char *ser;
@@ -1137,7 +1137,7 @@ void ical_freebusy_backend(long msgnum, void *data) {
  * Grab another user's free/busy times
  */
 void ical_freebusy(char *who) {
-       struct user usbuf;
+       struct ctdluser usbuf;
        char calendar_room_name[ROOMNAMELEN];
        char hold_rm[ROOMNAMELEN];
        char *serialized_request = NULL;
@@ -1281,7 +1281,7 @@ void cmd_ical(char *argbuf)
  */
 void ical_create_room(void)
 {
-       struct room qr;
+       struct ctdlroom qr;
        struct visit vbuf;
 
        /* Create the calendar room if it doesn't already exist */

diff --git a/citadel/serv_expire.c b/citadel/serv_expire.c
index 76ccd8e6b21848744edf8401e729089eb3300697..fdf2a01da65ff3006f8fbb5f24dae6116b180f0a 100644 (file)
--- a/citadel/serv_expire.c
+++ b/citadel/serv_expire.c
@@ -91,8 +91,8 @@ struct ValidUser {
 };
 
 
-struct roomref {
-       struct roomref *next;
+struct ctdlroomref {
+       struct ctdlroomref *next;
        long msgnum;
 };
 
@@ -108,7 +108,7 @@ struct ValidRoom *ValidRoomList = NULL;
 struct ValidUser *ValidUserList = NULL;
 int messages_purged;
 
-struct roomref *rr = NULL;
+struct ctdlroomref *rr = NULL;
 
 extern struct CitContext *ContextList;
 
@@ -117,7 +117,7 @@ extern struct CitContext *ContextList;
  * First phase of message purge -- gather the locations of messages which
  * qualify for purging and write them to a temp file.
  */
-void GatherPurgeMessages(struct room *qrbuf, void *data) {
+void GatherPurgeMessages(struct ctdlroom *qrbuf, void *data) {
        struct ExpirePolicy epbuf;
        long delnum;
        time_t xtime, now;
@@ -233,7 +233,7 @@ void PurgeMessages(void) {
 }
 
 
-void AddValidUser(struct user *usbuf, void *data) {
+void AddValidUser(struct ctdluser *usbuf, void *data) {
        struct ValidUser *vuptr;
 
        vuptr = (struct ValidUser *)mallok(sizeof(struct ValidUser));
@@ -242,7 +242,7 @@ void AddValidUser(struct user *usbuf, void *data) {
        ValidUserList = vuptr;
 }
 
-void AddValidRoom(struct room *qrbuf, void *data) {
+void AddValidRoom(struct ctdlroom *qrbuf, void *data) {
        struct ValidRoom *vrptr;
 
        vrptr = (struct ValidRoom *)mallok(sizeof(struct ValidRoom));
@@ -252,7 +252,7 @@ void AddValidRoom(struct room *qrbuf, void *data) {
        ValidRoomList = vrptr;
 }
 
-void DoPurgeRooms(struct room *qrbuf, void *data) {
+void DoPurgeRooms(struct ctdlroom *qrbuf, void *data) {
        time_t age, purge_secs;
        struct PurgeList *pptr;
        struct ValidUser *vuptr;
@@ -307,7 +307,7 @@ void DoPurgeRooms(struct room *qrbuf, void *data) {
 int PurgeRooms(void) {
        struct PurgeList *pptr;
        int num_rooms_purged = 0;
-       struct room qrbuf;
+       struct ctdlroom qrbuf;
        struct ValidUser *vuptr;
        char *transcript = NULL;
 
@@ -353,7 +353,7 @@ int PurgeRooms(void) {
 }
 
 
-void do_user_purge(struct user *us, void *data) {
+void do_user_purge(struct ctdluser *us, void *data) {
        int purge;
        time_t now;
        time_t purge_time;
@@ -361,7 +361,7 @@ void do_user_purge(struct user *us, void *data) {
 
        /* stupid recovery routine to re-create missing mailboxen.
         * don't enable this.
-       struct room qrbuf;
+       struct ctdlroom qrbuf;
        char mailboxname[ROOMNAMELEN];
        MailboxName(mailboxname, us, MAILROOM);
        create_room(mailboxname, 4, "", 0, 1, 1);
@@ -640,15 +640,15 @@ void cmd_expi(char *argbuf) {
 
 
 void do_fsck_msg(long msgnum, void *userdata) {
-       struct roomref *ptr;
+       struct ctdlroomref *ptr;
 
-       ptr = (struct roomref *)mallok(sizeof(struct roomref));
+       ptr = (struct ctdlroomref *)mallok(sizeof(struct ctdlroomref));
        ptr->next = rr;
        ptr->msgnum = msgnum;
        rr = ptr;
 }
 
-void do_fsck_room(struct room *qrbuf, void *data)
+void do_fsck_room(struct ctdlroom *qrbuf, void *data)
 {
        getroom(&CC->room, qrbuf->QRname);
        CtdlForEachMessage(MSGS_ALL, 0L, NULL, NULL, do_fsck_msg, NULL);
@@ -661,7 +661,7 @@ void cmd_fsck(char *argbuf) {
        long msgnum;
        struct cdbdata *cdbmsg;
        struct MetaData smi;
-       struct roomref *ptr;
+       struct ctdlroomref *ptr;
        int realcount;
 
        if (CtdlAccessCheck(ac_aide)) return;

diff --git a/citadel/serv_imap.c b/citadel/serv_imap.c
index ab15d9e123184e09d56677aaea0019070a838547..07c289219ad64abeea1eb17450fd15427559fd41 100644 (file)
--- a/citadel/serv_imap.c
+++ b/citadel/serv_imap.c
@@ -465,7 +465,7 @@ void imap_select(int num_parms, char *parms[]) {
        int c = 0;
        int ok = 0;
        int ra = 0;
-       struct room QRscratch;
+       struct ctdlroom QRscratch;
        int msgs, new;
        int floornum;
        int roomflags;
@@ -516,7 +516,7 @@ void imap_select(int num_parms, char *parms[]) {
         * usergoto() formally takes us to the desired room, happily returning
         * the number of messages and number of new messages.
         */
-       memcpy(&CC->room, &QRscratch, sizeof(struct room));
+       memcpy(&CC->room, &QRscratch, sizeof(struct ctdlroom));
        usergoto(NULL, 0, 0, &msgs, &new);
        IMAP->selected = 1;
 
@@ -625,7 +625,7 @@ void imap_list_floors(char *cmd, char *pattern) {
  * IMAP "subscribed folder" is equivocated to Citadel "known rooms."  This
  * may or may not be the desired behavior in the future.
  */
-void imap_lsub_listroom(struct room *qrbuf, void *data) {
+void imap_lsub_listroom(struct ctdlroom *qrbuf, void *data) {
        char buf[SIZ];
        int ra;
        char *pattern;
@@ -673,7 +673,7 @@ void imap_lsub(int num_parms, char *parms[]) {
 /*
  * Back end for imap_list()
  */
-void imap_list_listroom(struct room *qrbuf, void *data) {
+void imap_list_listroom(struct ctdlroom *qrbuf, void *data) {
        char buf[SIZ];
        int ra;
        char *pattern;
@@ -773,7 +773,7 @@ int imap_grabroom(char *returned_roomname, char *foldername) {
        char augmented_roomname[ROOMNAMELEN];
        char roomname[ROOMNAMELEN];
        int c;
-       struct room QRscratch;
+       struct ctdlroom QRscratch;
        int ra;
        int ok = 0;
 
@@ -1012,7 +1012,7 @@ void imap_delete(int num_parms, char *parms[]) {
 /*
  * Back end function for imap_rename()
  */
-void imap_rename_backend(struct room *qrbuf, void *data) {
+void imap_rename_backend(struct ctdlroom *qrbuf, void *data) {
        char foldername[SIZ];
        char newfoldername[SIZ];
        char newroomname[ROOMNAMELEN];

diff --git a/citadel/serv_listsub.c b/citadel/serv_listsub.c
index 5c3fc258107716d8785ecc2e895d738f263a2361..33b9b36453c187d25086d6ecdeacc38aca97d731 100644 (file)
--- a/citadel/serv_listsub.c
+++ b/citadel/serv_listsub.c
@@ -81,7 +81,7 @@ void listsub_generate_token(char *buf) {
  * Enter a subscription request
  */
 void do_subscribe(char *room, char *email, char *subtype, char *webpage) {
-       struct room qrbuf;
+       struct ctdlroom qrbuf;
        FILE *ncfp;
        char filename[SIZ];
        char token[SIZ];
@@ -193,7 +193,7 @@ void do_subscribe(char *room, char *email, char *subtype, char *webpage) {
  * Enter an unsubscription request
  */
 void do_unsubscribe(char *room, char *email, char *webpage) {
-       struct room qrbuf;
+       struct ctdlroom qrbuf;
        FILE *ncfp;
        char filename[SIZ];
        char token[SIZ];
@@ -307,7 +307,7 @@ void do_unsubscribe(char *room, char *email, char *webpage) {
  * Confirm a subscribe/unsubscribe request.
  */
 void do_confirm(char *room, char *token) {
-       struct room qrbuf;
+       struct ctdlroom qrbuf;
        FILE *ncfp;
        char filename[SIZ];
        char line_token[SIZ];

diff --git a/citadel/serv_network.c b/citadel/serv_network.c
index 7fb4f02415dcbaa75779a75b13ac1af0890b5f9d..a60e73cf5196fbbe00d5d9438c91b2853ba83237 100644 (file)
--- a/citadel/serv_network.c
+++ b/citadel/serv_network.c
@@ -852,7 +852,7 @@ void network_spoolout_room(char *room_to_spool) {
 /*
  * Batch up and send all outbound traffic from the current room
  */
-void network_queue_room(struct room *qrbuf, void *data) {
+void network_queue_room(struct ctdlroom *qrbuf, void *data) {
        struct RoomProcList *ptr;
 
        ptr = (struct RoomProcList *) mallok(sizeof (struct RoomProcList));

diff --git a/citadel/serv_smtp.c b/citadel/serv_smtp.c
index b150272d88027fa881aa5ff2d65bfe9a9cdaa8aa..4b2872dcdfc6c7223fb6177cfe12e4149fe0b7c1 100644 (file)
--- a/citadel/serv_smtp.c
+++ b/citadel/serv_smtp.c
@@ -62,7 +62,7 @@
 struct citsmtp {               /* Information about the current session */
        int command_state;
        char helo_node[SIZ];
-       struct user vrfy_buffer;
+       struct ctdluser vrfy_buffer;
        int vrfy_count;
        char vrfy_match[SIZ];
        char from[SIZ];
@@ -230,11 +230,11 @@ void smtp_auth(char *argbuf) {
 /*
  * Back end for smtp_vrfy() command
  */
-void smtp_vrfy_backend(struct user *us, void *data) {
+void smtp_vrfy_backend(struct ctdluser *us, void *data) {
 
        if (!fuzzy_match(us, SMTP->vrfy_match)) {
                ++SMTP->vrfy_count;
-               memcpy(&SMTP->vrfy_buffer, us, sizeof(struct user));
+               memcpy(&SMTP->vrfy_buffer, us, sizeof(struct ctdluser));
        }
 }
 
@@ -269,7 +269,7 @@ void smtp_vrfy(char *argbuf) {
 /*
  * Back end for smtp_expn() command
  */
-void smtp_expn_backend(struct user *us, void *data) {
+void smtp_expn_backend(struct ctdluser *us, void *data) {
 
        if (!fuzzy_match(us, SMTP->vrfy_match)) {
 
@@ -281,7 +281,7 @@ void smtp_expn_backend(struct user *us, void *data) {
                }
 
                ++SMTP->vrfy_count;
-               memcpy(&SMTP->vrfy_buffer, us, sizeof(struct user));
+               memcpy(&SMTP->vrfy_buffer, us, sizeof(struct ctdluser));
        }
 }
 
@@ -1407,7 +1407,7 @@ void cmd_smtp(char *argbuf) {
  * Initialize the SMTP outbound queue
  */
 void smtp_init_spoolout(void) {
-       struct room qrbuf;
+       struct ctdlroom qrbuf;
 
        /*
         * Create the room.  This will silently fail if the room already

diff --git a/citadel/serv_upgrade.c b/citadel/serv_upgrade.c
index db762030592c78d68d8a9ce7a14092fea84e9cdc..d206176b6a441ccf5c094f7c26d36788c103566d 100644 (file)
--- a/citadel/serv_upgrade.c
+++ b/citadel/serv_upgrade.c
@@ -46,7 +46,7 @@
 
 void do_pre555_user_upgrade(void) {
         struct pre555user usbuf;
-       struct user newus;
+       struct ctdluser newus;
         struct cdbdata *cdbus;
        char tempfilename[PATH_MAX];
        FILE *fp, *tp;
@@ -76,7 +76,7 @@ void do_pre555_user_upgrade(void) {
        while (fread(&usbuf, sizeof(struct pre555user), 1, fp) > 0) {
            if (strlen(usbuf.fullname) > 0) {
                lprintf(9, "Upgrading <%s>\n", usbuf.fullname);
-               memset(&newus, 0, sizeof(struct user));
+               memset(&newus, 0, sizeof(struct ctdluser));
 
                newus.uid = usbuf.USuid;
                strcpy(newus.password, usbuf.password);
@@ -133,10 +133,10 @@ void do_pre555_user_upgrade(void) {
 /* 
  * Back end processing function for cmd_bmbx
  */
-void cmd_bmbx_backend(struct room *qrbuf, void *data) {
+void cmd_bmbx_backend(struct ctdlroom *qrbuf, void *data) {
        static struct RoomProcList *rplist = NULL;
        struct RoomProcList *ptr;
-       struct room qr;
+       struct ctdlroom qr;
 
        /* Lazy programming here.  Call this function as a ForEachRoom backend
         * in order to queue up the room names, or call it with a null room
@@ -188,10 +188,10 @@ void bump_mailbox_generation_numbers(void) {
 /* 
  * Back end processing function for convert_bbsuid_to_minusone()
  */
-void cbtm_backend(struct user *usbuf, void *data) {
+void cbtm_backend(struct ctdluser *usbuf, void *data) {
        static struct UserProcList *uplist = NULL;
        struct UserProcList *ptr;
-       struct user us;
+       struct ctdluser us;
 
        /* Lazy programming here.  Call this function as a ForEachUser backend
         * in order to queue up the room names, or call it with a null user

diff --git a/citadel/serv_vandelay.c b/citadel/serv_vandelay.c
index c5a64f83e832996fb32ad2a46dfbb6fa6c9da7e5..4b54fe582c16b1fa37b7d93136ac070a8d0574ce 100644 (file)
--- a/citadel/serv_vandelay.c
+++ b/citadel/serv_vandelay.c
@@ -50,7 +50,7 @@ char artv_tempfilename1[PATH_MAX];
 char artv_tempfilename2[PATH_MAX];
 FILE *artv_global_message_list;
 
-void artv_export_users_backend(struct user *usbuf, void *data) {
+void artv_export_users_backend(struct ctdluser *usbuf, void *data) {
        cprintf("user\n");
        cprintf("%d\n", usbuf->version);
        cprintf("%ld\n", (long)usbuf->uid);
@@ -79,7 +79,7 @@ void artv_export_room_msg(long msgnum, void *userdata) {
 }
 
 
-void artv_export_rooms_backend(struct room *qrbuf, void *data) {
+void artv_export_rooms_backend(struct ctdlroom *qrbuf, void *data) {
        cprintf("room\n");
        cprintf("%s\n", qrbuf->QRname);
        cprintf("%s\n", qrbuf->QRpasswd);
@@ -363,7 +363,7 @@ void artv_import_control(void) {
 
 void artv_import_user(void) {
        char buf[SIZ];
-       struct user usbuf;
+       struct ctdluser usbuf;
 
        client_gets(buf);       usbuf.version = atoi(buf);
        client_gets(buf);       usbuf.uid = atoi(buf);
@@ -384,7 +384,7 @@ void artv_import_user(void) {
 
 void artv_import_room(void) {
        char buf[SIZ];
-       struct room qrbuf;
+       struct ctdlroom qrbuf;
        long msgnum;
        int msgcount = 0;
 

diff --git a/citadel/serv_vcard.c b/citadel/serv_vcard.c
index beed02f7f1663461506bdd9dd2420aab4d11e4fc..b3bb09b1e72fb8b158b6a380cfb4329a0c7b35f7 100644 (file)
--- a/citadel/serv_vcard.c
+++ b/citadel/serv_vcard.c
@@ -255,7 +255,7 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) {
        char *ptr;
        int linelen;
        char buf[SIZ];
-       struct user usbuf;
+       struct ctdluser usbuf;
        long what_user;
 
        if (!CC->logged_in) return(0);  /* Only do this if logged in. */
@@ -291,7 +291,7 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) {
                        if (what_user == CC->user.usernum) {
                                /* It's the logged in user.  That was easy. */
                                memcpy(&usbuf, &CC->user,
-                                       sizeof(struct user) );
+                                       sizeof(struct ctdluser) );
                        }
                        
                        else if (getuserbynumber(&usbuf, what_user) == 0) {
@@ -421,7 +421,7 @@ void vcard_gu_backend(long msgnum, void *userdata) {
  * If this user has a vcard on disk, read it into memory, otherwise allocate
  * and return an empty vCard.
  */
-struct vCard *vcard_get_user(struct user *u) {
+struct vCard *vcard_get_user(struct ctdluser *u) {
         char hold_rm[ROOMNAMELEN];
         char config_rm[ROOMNAMELEN];
        struct CtdlMessage *msg;
@@ -458,7 +458,7 @@ struct vCard *vcard_get_user(struct user *u) {
 /*
  * Write our config to disk
  */
-void vcard_write_user(struct user *u, struct vCard *v) {
+void vcard_write_user(struct ctdluser *u, struct vCard *v) {
         char temp[PATH_MAX];
         FILE *fp;
        char *ser;
@@ -559,7 +559,7 @@ void cmd_regi(char *argbuf) {
  */
 void cmd_greg(char *argbuf)
 {
-       struct user usbuf;
+       struct ctdluser usbuf;
        struct vCard *v;
        char *s;
        char who[SIZ];

diff --git a/citadel/server.h b/citadel/server.h
index 11378589e34d79d328def3a28e9d11a6aef3a2f1..575640ec8cd9bfdc83a95e1bbe63e3d76e941319 100644 (file)
--- a/citadel/server.h
+++ b/citadel/server.h
@@ -67,8 +67,8 @@ enum {
 struct CitContext {
        struct CitContext *next;        /* Link to next session in the list */
 
-       struct user user;       /* Database record buffers */
-       struct room room;
+       struct ctdluser user;   /* Database record buffers */
+       struct ctdlroom room;
 
        int state;              /* thread state (see CON_ values below) */
        int kill_me;            /* Set to nonzero to flag for termination */

diff --git a/citadel/techdoc/citadelapi.txt b/citadel/techdoc/citadelapi.txt
index ab5d9f334f6c3f675c1098ba77f58d449726933f..1aad5fc2a7d123fa0e68aaa4adefb188f70a89f1 100644 (file)
--- a/citadel/techdoc/citadelapi.txt
+++ b/citadel/techdoc/citadelapi.txt
@@ -18,11 +18,11 @@ the person documenting it have a chance to mature a bit.  :)
   USER RELATED FUNCTIONS
   ----------------------
  
- The fundamental user data is stored in "struct user" which is defined
+ The fundamental user data is stored in "struct ctdluser" which is defined
 in citadel.h.  The following functions are available:
   
  
- int getuser(struct user *usbuf, char name[])
+ int getuser(struct ctdluser *usbuf, char name[])
  
  Given the name of a requested user and a buffer to store the user
 record in, getuser() will search the userlog for the named user and load its
@@ -30,14 +30,14 @@ data into the buffer.  getuser() returns 0 upon success or a nonzero error
 code if the requested operation could not be performed.
  
  
- void putuser(struct user *usbuf, char *name)
+ void putuser(struct ctdluser *usbuf, char *name)
  
  After reading in a user record with getuser() and perhaps modifying the data
 in some way, a program may use putuser() to write it back to disk.
  
  
- int lgetuser(struct user *usbuf, char *name)
- void lputuser(struct user *usbuf, char *name)
+ int lgetuser(struct ctdluser *usbuf, char *name)
+ void lputuser(struct ctdluser *usbuf, char *name)
  
  If critical-section operation is required, this pair of calls may be used.
 They function the same as getuser() and putuser(), except that lgetuser()
@@ -51,14 +51,14 @@ multiple files may result in a deadlock condition which would freeze the
 entire server.
  
    
- void ForEachUser(void (*CallBack)(struct user *EachUser))
+ void ForEachUser(void (*CallBack)(struct ctdluser *EachUser))
  
  This allows a user-supplied function to be called once for each user on
 the system.  The user-supplied function will be called with a pointer to a
 user structure as its only argument.
   
  
- int getuserbynumber(struct user *usbuf, long int number)
+ int getuserbynumber(struct ctdluser *usbuf, long int number)
  
  getuserbynumber() functions similarly to getuser(), except that it is
 supplied with a user number rather than a name.  Calling this function
@@ -187,11 +187,11 @@ registered.
   FUNCTIONS WHICH MANIPULATE USER/ROOM RELATIONSHIPS
 
  void CtdlGetRelationship(struct visit *vbuf,
-                        struct user *rel_user,
-                        struct room *rel_room);
+                        struct ctdluser *rel_user,
+                        struct ctdlroom *rel_room);
  void CtdlSetRelationship(struct visit *newvisit,
-                        struct user *rel_user,
-                        struct room *rel_room);
+                        struct ctdluser *rel_user,
+                        struct ctdlroom *rel_room);
  
  These functions get/set a "struct visit" structure which may contain
 information about the relationship between a user and a room.  Specifically:
@@ -221,7 +221,7 @@ as "new messages."
  
   
  
- int CtdlRoomAccess(struct room *roombuf, struct user *userbuf)
+ int CtdlRoomAccess(struct ctdlroom *roombuf, struct ctdluser *userbuf)
  
  This is a convenience function which uses CtdlGetRelationship() to determine
 whether a user has access to a room.  It returns a bucket of bits which may

diff --git a/citadel/techdoc/hack.txt b/citadel/techdoc/hack.txt
index 29ebcd6df681220ff301c890b393c4d38c8c2d17..5cceb84bb2dd498b0662512d93e8d0ebab4d51b7 100644 (file)
--- a/citadel/techdoc/hack.txt
+++ b/citadel/techdoc/hack.txt
@@ -24,7 +24,7 @@ by Citadel.  Here are some of the tables we keep on disk:
 user name (translated to lower case for indexing purposes).  The records in
 this file look something like this:
 
-struct user {                       /* User record                      */
+struct ctdluser {                       /* User record                      */
         int version;                    /* Cit vers. which created this rec */
         uid_t uid;                      /* Associate with a unix account?   */
         char password[32];              /* password (for BBS-only users)    */
@@ -66,7 +66,7 @@ information so we set it up dynamically.
 system, public or private or mailbox.  It's indexed by room name (also in
 lower case for easy indexing) and it contains records which look like this:
 
-struct room {
+struct ctdlroom {
         char QRname[ROOMNAMELEN];       /* Name of room                     */
         char QRpasswd[10];              /* Only valid if it's a private rm  */
         long QRroomaide;                /* User number of room aide         */

diff --git a/citadel/user_ops.c b/citadel/user_ops.c
index d86e702feb25d95dd9a0ea7a0b4a82a1a040eb2d..87c957564c1068208fac67b2f58717b06a96cd3a 100644 (file)
--- a/citadel/user_ops.c
+++ b/citadel/user_ops.c
@@ -58,7 +58,7 @@
  * getuser()  -  retrieve named user into supplied buffer.
  *               returns 0 on success
  */
-int getuser(struct user *usbuf, char name[])
+int getuser(struct ctdluser *usbuf, char name[])
 {
 
        char lowercase_name[USERNAME_SIZE];
@@ -67,7 +67,7 @@ int getuser(struct user *usbuf, char name[])
        struct cdbdata *cdbus;
        int using_sysuser = 0;
 
-       memset(usbuf, 0, sizeof(struct user));
+       memset(usbuf, 0, sizeof(struct ctdluser));
 
 #ifdef ENABLE_AUTOLOGIN
        if (CtdlAssociateSystemUser(sysuser_name, name) == 0) {
@@ -93,8 +93,8 @@ int getuser(struct user *usbuf, char name[])
                return(1);
        }
        memcpy(usbuf, cdbus->ptr,
-              ((cdbus->len > sizeof(struct user)) ?
-               sizeof(struct user) : cdbus->len));
+              ((cdbus->len > sizeof(struct ctdluser)) ?
+               sizeof(struct ctdluser) : cdbus->len));
        cdb_free(cdbus);
 
        return (0);
@@ -104,7 +104,7 @@ int getuser(struct user *usbuf, char name[])
 /*
  * lgetuser()  -  same as getuser() but locks the record
  */
-int lgetuser(struct user *usbuf, char *name)
+int lgetuser(struct ctdluser *usbuf, char *name)
 {
        int retcode;
 
@@ -119,7 +119,7 @@ int lgetuser(struct user *usbuf, char *name)
 /*
  * putuser()  -  write user buffer into the correct place on disk
  */
-void putuser(struct user *usbuf)
+void putuser(struct ctdluser *usbuf)
 {
        char lowercase_name[USERNAME_SIZE];
        int a;
@@ -133,7 +133,7 @@ void putuser(struct user *usbuf)
        usbuf->version = REV_LEVEL;
        cdb_store(CDB_USERS,
                  lowercase_name, strlen(lowercase_name),
-                 usbuf, sizeof(struct user));
+                 usbuf, sizeof(struct ctdluser));
 
 }
 
@@ -141,7 +141,7 @@ void putuser(struct user *usbuf)
 /*
  * lputuser()  -  same as putuser() but locks the record
  */
-void lputuser(struct user *usbuf)
+void lputuser(struct ctdluser *usbuf)
 {
        putuser(usbuf);
        end_critical_section(S_USERS);
@@ -199,8 +199,8 @@ void put_visit(struct visit *newvisit)
  * Define a relationship between a user and a room
  */
 void CtdlSetRelationship(struct visit *newvisit,
-                        struct user *rel_user,
-                        struct room *rel_room)
+                        struct ctdluser *rel_user,
+                        struct ctdlroom *rel_room)
 {
 
 
@@ -218,8 +218,8 @@ void CtdlSetRelationship(struct visit *newvisit,
  * Locate a relationship between a user and a room
  */
 void CtdlGetRelationship(struct visit *vbuf,
-                        struct user *rel_user,
-                        struct room *rel_room)
+                        struct ctdluser *rel_user,
+                        struct ctdlroom *rel_room)
 {
 
        char IndexBuf[32];
@@ -256,7 +256,7 @@ void CtdlGetRelationship(struct visit *vbuf,
 }
 
 
-void MailboxName(char *buf, size_t n, const struct user *who, const char *prefix)
+void MailboxName(char *buf, size_t n, const struct ctdluser *who, const char *prefix)
 {
        snprintf(buf, n, "%010ld.%s", who->usernum, prefix);
 }
@@ -299,17 +299,17 @@ int is_room_aide(void)
  * WARNING: don't use this function unless you absolutely have to.  It does
  *          a sequential search and therefore is computationally expensive.
  */
-int getuserbynumber(struct user *usbuf, long int number)
+int getuserbynumber(struct ctdluser *usbuf, long int number)
 {
        struct cdbdata *cdbus;
 
        cdb_rewind(CDB_USERS);
 
        while (cdbus = cdb_next_item(CDB_USERS), cdbus != NULL) {
-               memset(usbuf, 0, sizeof(struct user));
+               memset(usbuf, 0, sizeof(struct ctdluser));
                memcpy(usbuf, cdbus->ptr,
-                      ((cdbus->len > sizeof(struct user)) ?
-                       sizeof(struct user) : cdbus->len));
+                      ((cdbus->len > sizeof(struct ctdluser)) ?
+                       sizeof(struct ctdluser) : cdbus->len));
                cdb_free(cdbus);
                if (usbuf->usernum == number) {
                        cdb_close_cursor(CDB_USERS);
@@ -665,7 +665,7 @@ void cmd_pass(char *buf)
 int purge_user(char pname[])
 {
        char filename[64];
-       struct user usbuf;
+       struct ctdluser usbuf;
        char lowercase_name[USERNAME_SIZE];
        int a;
        struct CitContext *ccptr;
@@ -729,8 +729,8 @@ int purge_user(char pname[])
  */
 int create_user(char *newusername, int become_user)
 {
-       struct user usbuf;
-       struct room qrbuf;
+       struct ctdluser usbuf;
+       struct ctdlroom qrbuf;
        struct passwd *p = NULL;
        char username[SIZ];
        char mailboxname[ROOMNAMELEN];
@@ -756,7 +756,7 @@ int create_user(char *newusername, int become_user)
        }
 
        /* Go ahead and initialize a new user record */
-       memset(&usbuf, 0, sizeof(struct user));
+       memset(&usbuf, 0, sizeof(struct ctdluser));
        strcpy(usbuf.fullname, username);
        strcpy(usbuf.password, "");
        usbuf.uid = uid;
@@ -802,7 +802,7 @@ int create_user(char *newusername, int become_user)
 
        if (become_user) {
                /* Now become the user we just created */
-               memcpy(&CC->user, &usbuf, sizeof(struct user));
+               memcpy(&CC->user, &usbuf, sizeof(struct ctdluser));
                strcpy(CC->curr_user, username);
                CC->logged_in = 1;
        
@@ -1052,7 +1052,7 @@ void cmd_gtsn(char *argbuf) {
 void cmd_invt_kick(char *iuser, int op)
                        /* user name */
 {                              /* 1 = invite, 0 = kick out */
-       struct user USscratch;
+       struct ctdluser USscratch;
        char bbb[SIZ];
        struct visit vbuf;
 
@@ -1164,7 +1164,7 @@ void cmd_forg(void)
 void cmd_gnur(void)
 {
        struct cdbdata *cdbus;
-       struct user usbuf;
+       struct ctdluser usbuf;
 
        if (CtdlAccessCheck(ac_aide)) {
                return;
@@ -1180,10 +1180,10 @@ void cmd_gnur(void)
         */
        cdb_rewind(CDB_USERS);
        while (cdbus = cdb_next_item(CDB_USERS), cdbus != NULL) {
-               memset(&usbuf, 0, sizeof(struct user));
+               memset(&usbuf, 0, sizeof(struct ctdluser));
                memcpy(&usbuf, cdbus->ptr,
-                      ((cdbus->len > sizeof(struct user)) ?
-                       sizeof(struct user) : cdbus->len));
+                      ((cdbus->len > sizeof(struct ctdluser)) ?
+                       sizeof(struct ctdluser) : cdbus->len));
                cdb_free(cdbus);
                if ((usbuf.flags & US_NEEDVALID)
                    && (usbuf.axlevel > 0)) {
@@ -1215,7 +1215,7 @@ void cmd_vali(char *v_args)
 {
        char user[SIZ];
        int newax;
-       struct user userbuf;
+       struct ctdluser userbuf;
 
        extract(user, v_args, 0);
        newax = extract_int(v_args, 1);
@@ -1249,19 +1249,19 @@ void cmd_vali(char *v_args)
 /* 
  *  Traverse the user file...
  */
-void ForEachUser(void (*CallBack) (struct user * EachUser, void *out_data),
+void ForEachUser(void (*CallBack) (struct ctdluser * EachUser, void *out_data),
                 void *in_data)
 {
-       struct user usbuf;
+       struct ctdluser usbuf;
        struct cdbdata *cdbus;
 
        cdb_rewind(CDB_USERS);
 
        while (cdbus = cdb_next_item(CDB_USERS), cdbus != NULL) {
-               memset(&usbuf, 0, sizeof(struct user));
+               memset(&usbuf, 0, sizeof(struct ctdluser));
                memcpy(&usbuf, cdbus->ptr,
-                      ((cdbus->len > sizeof(struct user)) ?
-                       sizeof(struct user) : cdbus->len));
+                      ((cdbus->len > sizeof(struct ctdluser)) ?
+                       sizeof(struct ctdluser) : cdbus->len));
                cdb_free(cdbus);
                (*CallBack) (&usbuf, in_data);
        }
@@ -1271,7 +1271,7 @@ void ForEachUser(void (*CallBack) (struct user * EachUser, void *out_data),
 /*
  * List one user (this works with cmd_list)
  */
-void ListThisUser(struct user *usbuf, void *data)
+void ListThisUser(struct ctdluser *usbuf, void *data)
 {
        if (usbuf->axlevel > 0) {
                if ((CC->user.axlevel >= 6)
@@ -1339,7 +1339,7 @@ void cmd_chek(void)
  */
 void cmd_qusr(char *who)
 {
-       struct user usbuf;
+       struct ctdluser usbuf;
 
        if (getuser(&usbuf, who) == 0) {
                cprintf("%d %s\n", CIT_OK, usbuf.fullname);
@@ -1354,7 +1354,7 @@ void cmd_qusr(char *who)
  */
 void cmd_agup(char *cmdbuf)
 {
-       struct user usbuf;
+       struct ctdluser usbuf;
        char requested_user[SIZ];
 
        if (CtdlAccessCheck(ac_aide)) {
@@ -1386,7 +1386,7 @@ void cmd_agup(char *cmdbuf)
  */
 void cmd_asup(char *cmdbuf)
 {
-       struct user usbuf;
+       struct ctdluser usbuf;
        char requested_user[SIZ];
        char notify[SIZ];
        int np;
@@ -1485,7 +1485,7 @@ int InitialMailCheck()
         int num_newmsgs = 0;
         int a;
         char mailboxname[ROOMNAMELEN];
-        struct room mailbox;
+        struct ctdlroom mailbox;
         struct visit vbuf;
         struct cdbdata *cdbfr;
         long *msglist = NULL;

diff --git a/citadel/user_ops.h b/citadel/user_ops.h
index e90df899909544840ea33fb249be4f788dd18f06..de83dc3c453701aa48669440cbbbe3a1df4c7a6f 100644 (file)
--- a/citadel/user_ops.h
+++ b/citadel/user_ops.h
@@ -1,12 +1,12 @@
 /* $Id$ */
 int hash (char *str);
-int getuser (struct user *, char *);
-int lgetuser (struct user *, char *);
-void putuser (struct user *);
-void lputuser (struct user *);
+int getuser (struct ctdluser *, char *);
+int lgetuser (struct ctdluser *, char *);
+void putuser (struct ctdluser *);
+void lputuser (struct ctdluser *);
 int is_aide (void);
 int is_room_aide (void);
-int getuserbynumber (struct user *usbuf, long int number);
+int getuserbynumber (struct ctdluser *usbuf, long int number);
 void cmd_user (char *cmdbuf);
 void session_startup (void);
 void logout (struct CitContext *who);
@@ -24,9 +24,9 @@ void cmd_invt_kick (char *iuser, int op);
 void cmd_forg (void);
 void cmd_gnur (void);
 void cmd_vali (char *v_args);
-void ForEachUser(void (*CallBack)(struct user *EachUser, void *out_data),
+void ForEachUser(void (*CallBack)(struct ctdluser *EachUser, void *out_data),
        void *in_data);
-void ListThisUser(struct user *usbuf, void *data);
+void ListThisUser(struct ctdluser *usbuf, void *data);
 void cmd_list (void);
 void cmd_chek (void);
 void cmd_qusr (char *who);
@@ -37,12 +37,12 @@ int NewMailCount(void);
 int InitialMailCheck(void);
 void put_visit(struct visit *newvisit);
 void CtdlGetRelationship(struct visit *vbuf,
-                        struct user *rel_user,
-                        struct room *rel_room);
+                        struct ctdluser *rel_user,
+                        struct ctdlroom *rel_room);
 void CtdlSetRelationship(struct visit *newvisit,
-                        struct user *rel_user,
-                        struct room *rel_room);
-void MailboxName(char *buf, size_t n, const struct user *who,
+                        struct ctdluser *rel_user,
+                        struct ctdlroom *rel_room);
+void MailboxName(char *buf, size_t n, const struct ctdluser *who,
                 const char *prefix);
 int GenerateRelationshipIndex(  char *IndexBuf,
                                 long RoomID,