* Renamed:

[citadel.git] / citadel / server.h

diff --git a/citadel/server.h b/citadel/server.h
index d99be8ddf38c0ec39ede4b280be0e37eb092baab..11378589e34d79d328def3a28e9d11a6aef3a2f1 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 usersupp usersupp;       /* Database record buffers */
-       struct quickroom quickroom;
+       struct user user;       /* Database record buffers */
+       struct room room;
 
        int state;              /* thread state (see CON_ values below) */
        int kill_me;            /* Set to nonzero to flag for termination */
@@ -184,8 +184,8 @@ struct ChatLine {
  * Various things we need to lock and unlock
  */
 enum {
-       S_USERSUPP,
-       S_QUICKROOM,
+       S_USERS,
+       S_ROOMS,
        S_SESSION_TABLE,
        S_FLOORTAB,
        S_CHATQUEUE,
@@ -235,8 +235,8 @@ enum {
  */
 enum {
        CDB_MSGMAIN,            /* message base                  */
-       CDB_USERSUPP,           /* user file                     */
-       CDB_QUICKROOM,          /* room index                    */
+       CDB_USERS,              /* user file                     */
+       CDB_ROOMS,              /* room index                    */
        CDB_FLOORTAB,           /* floor index                   */
        CDB_MSGLISTS,           /* room message lists            */
        CDB_VISIT,              /* user/room relationships       */
@@ -408,11 +408,6 @@ struct visit {
 #define V_LOCKOUT      2       /* User is locked out of this room  */
 #define V_ACCESS       4       /* Access is granted to this room   */
 
-#define UA_KNOWN                2
-#define UA_GOTOALLOWED          4
-#define UA_HASNEWMSGS           8
-#define UA_ZAPPED              16
-
 
 /* Supplementary data for a message on disk
  * (These are kept separately from the message itself because they are