* Added a fourth color mode in the client: "user" which turns color

[citadel.git] / citadel / user_ops.c

diff --git a/citadel/user_ops.c b/citadel/user_ops.c
index 6bffa6f3dc0ae7a68b4f97dfb8f2446f6de58250..45462e65202240d7ed4856bf93b7146ee33ad613 100644 (file)
--- a/citadel/user_ops.c
+++ b/citadel/user_ops.c
@@ -109,18 +109,19 @@ void lputuser(struct usersupp *usbuf, char *name) {
  * Index-generating function used by Ctdl[Get|Set]Relationship
  */
 int GenerateRelationshipIndex( char *IndexBuf,
-                               struct usersupp *rel_user,
-                               struct quickroom *rel_room) {
+                               long RoomID,
+                               long RoomGen,
+                               long UserID) {
 
        struct {
-               long RoomID;
-               long RoomGen;
-               long UserID;
+               long iRoomID;
+               long iRoomGen;
+               long iUserID;
                } TheIndex;
 
-       TheIndex.RoomID = rel_room->QRnumber;
-       TheIndex.RoomGen = rel_room->QRgen;
-       TheIndex.UserID = rel_user->usernum;
+       TheIndex.iRoomID = RoomID;
+       TheIndex.iRoomGen = RoomGen;
+       TheIndex.iUserID = UserID;
 
        memcpy(IndexBuf, &TheIndex, sizeof(TheIndex));
        return(sizeof(TheIndex));
@@ -144,7 +145,10 @@ void CtdlSetRelationship(struct visit *newvisit,
         newvisit->v_usernum = rel_user->usernum;
 
        /* Generate an index */
-       IndexLen = GenerateRelationshipIndex(IndexBuf, rel_user, rel_room);
+       IndexLen = GenerateRelationshipIndex(IndexBuf,
+               rel_room->QRnumber,
+               rel_room->QRgen,
+               rel_user->usernum);
 
        /* Store the record */
        cdb_store(CDB_VISIT, IndexBuf, IndexLen,
@@ -164,7 +168,10 @@ void CtdlGetRelationship(struct visit *vbuf,
        struct cdbdata *cdbvisit;
 
        /* Generate an index */
-       IndexLen = GenerateRelationshipIndex(IndexBuf, rel_user, rel_room);
+       IndexLen = GenerateRelationshipIndex(IndexBuf,
+               rel_room->QRnumber,
+               rel_room->QRgen,
+               rel_user->usernum);
 
        /* Clear out the buffer */
        bzero(vbuf, sizeof(struct visit));