Marked code that will require some rework for LMDB.

[citadel.git] / citadel / server / msgbase.c

diff --git a/citadel/server/msgbase.c b/citadel/server/msgbase.c
index e5f8b1e190813e8f672520aeb2a02ef170126fea..9b4f2535f73b404bca384fd5178be5c526ed57b3 100644 (file)
--- a/citadel/server/msgbase.c
+++ b/citadel/server/msgbase.c
@@ -448,7 +448,7 @@ void CtdlSetSeen(long *target_msgnums, int num_target_msgnums,
        cdbfr = cdb_fetch(CDB_MSGLISTS, &which_room->QRnumber, sizeof(long));
        if (cdbfr != NULL) {
                msglist = (long *) cdbfr->ptr;
-               cdbfr->ptr = NULL;      // CtdlSetSeen() now owns this memory
+               cdbfr->ptr = NULL;      // CtdlSetSeen() now owns this memory (this needs attention if we move to LMDB)
                num_msgs = cdbfr->len / sizeof(long);
                cdb_free(cdbfr);
        }
@@ -2265,9 +2265,10 @@ int CtdlSaveMsgPointersInRoom(char *roomname, long newmsgidlist[], int num_newms
        if (cdbfr == NULL) {
                msglist = NULL;
                num_msgs = 0;
-       } else {
+       }
+       else {
                msglist = (long *) cdbfr->ptr;
-               cdbfr->ptr = NULL;      /* CtdlSaveMsgPointerInRoom() now owns this memory */
+               cdbfr->ptr = NULL;      // CtdlSaveMsgPointerInRoom() now owns this memory (this needs attention if we move to LMDB)
                num_msgs = cdbfr->len / sizeof(long);
                cdb_free(cdbfr);
        }
@@ -3255,7 +3256,7 @@ int CtdlDeleteMessages(const char *room_name,     // which room
        if (cdbfr != NULL) {
                dellist = malloc(cdbfr->len);
                msglist = (long *) cdbfr->ptr;
-               cdbfr->ptr = NULL;      /* CtdlDeleteMessages() now owns this memory */
+               cdbfr->ptr = NULL;      // CtdlDeleteMessages() now owns this memory (this needs attention if we move to LMDB)
                num_msgs = cdbfr->len / sizeof(long);
                cdb_free(cdbfr);
        }
@@ -3265,18 +3266,11 @@ int CtdlDeleteMessages(const char *room_name,   // which room
                int have_more_del = 1;
 
                num_msgs = sort_msglist(msglist, num_msgs);
-               if (num_dmsgnums > 1)
+               if (num_dmsgnums > 1) {
                        num_dmsgnums = sort_msglist(dmsgnums, num_dmsgnums);
-/*
-               {
-                       StrBuf *dbg = NewStrBuf();
-                       for (i = 0; i < num_dmsgnums; i++)
-                               StrBufAppendPrintf(dbg, ", %ld", dmsgnums[i]);
-                       syslog(LOG_DEBUG, "msgbase: Deleting before: %s", ChrPtr(dbg));
-                       FreeStrBuf(&dbg);
                }
-*/
-               i = 0; j = 0;
+               i = 0;
+               j = 0;
                while ((i < num_msgs) && (have_more_del)) {
                        delete_this = 0x00;