X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fexpire%2Fserv_expire.c;h=94999b9d71eba4bbdb61838034109560a57693ad;hb=58f686487cf5f14d5da5357c67f2e6624dbde027;hp=cf501e081615b06a425e8ace4906dbfdc00a9298;hpb=15054b0f11409cfc68102560fe4ab5a4e2bf4ea0;p=citadel.git

diff --git a/citadel/modules/expire/serv_expire.c b/citadel/modules/expire/serv_expire.c
index cf501e081..94999b9d7 100644
--- a/citadel/modules/expire/serv_expire.c
+++ b/citadel/modules/expire/serv_expire.c
@@ -192,7 +192,7 @@ void GatherPurgeMessages(struct ctdlroom *qrbuf, void *data) {
 		for (a=0; a<num_msgs; ++a) {
 			delnum = msglist[a];
 
-			msg = CtdlFetchMessage(delnum, 0); /* dont need body */
+			msg = CtdlFetchMessage(delnum, 0, 1); /* dont need body */
 			if (msg != NULL) {
 				xtime = atol(msg->cm_fields[eTimestamp]);
 				CM_Free(msg);
@@ -704,24 +704,24 @@ int PurgeUseTable(StrBuf *ErrMsg) {
 
 	syslog(LOG_DEBUG, "Purge use table: phase 1");
 	cdb_rewind(CDB_USETABLE);
-	while(cdbut = cdb_next_item(CDB_USETABLE), cdbut != NULL) {
-
-		/*
-		 * TODODRW: change this to create a new function time_t cdb_get_timestamp( struct cdbdata *)
-		 * this will release this file from the serv_network.h
-		 * Maybe it could be a macro that extracts and casts the reult
-		 */
+	while(cdbut = cdb_next_item(CDB_USETABLE), cdbut != NULL)
+	{
 		if (cdbut->len > sizeof(struct UseTable))
 			memcpy(&ut, cdbut->ptr, sizeof(struct UseTable));
-		else {
+		else
+		{
 			memset(&ut, 0, sizeof(struct UseTable));
 			memcpy(&ut, cdbut->ptr, cdbut->len);
 		}
 		cdb_free(cdbut);
 
-		if ( (time(NULL) - ut.ut_timestamp) > USETABLE_RETAIN ) {
+		syslog(LOG_DEBUG, "UT: [%s] at %s", ut.ut_msgid, asctime(localtime(&ut.ut_timestamp)));	// FIXME take this out ajc
+
+		if ( (time(NULL) - ut.ut_timestamp) > USETABLE_RETAIN )
+		{
 			uptr = (struct UPurgeList *) malloc(sizeof(struct UPurgeList));
-			if (uptr != NULL) {
+			if (uptr != NULL)
+			{
 				uptr->next = ul;
 				safestrncpy(uptr->up_key, ut.ut_msgid, sizeof uptr->up_key);
 				ul = uptr;
@@ -765,7 +765,7 @@ int PurgeEuidIndexTable(void) {
 
 		memcpy(&msgnum, cdbei->ptr, sizeof(long));
 
-		msg = CtdlFetchMessage(msgnum, 0);
+		msg = CtdlFetchMessage(msgnum, 0, 1);
 		if (msg != NULL) {
 			CM_Free(msg);	/* it still exists, so do nothing */
 		}