X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fexpire%2Fserv_expire.c;h=e807f969bf34cad0c9d80b3da73a3b94b7c9da7b;hb=5abf3d0c3343809374a116cbe23c808a81a780c4;hp=d856761c8657991d6d9081f26f0886bd55bb8963;hpb=091d26d0ce0524e664020f5d33b13bc42e6a88e0;p=citadel.git

diff --git a/citadel/modules/expire/serv_expire.c b/citadel/modules/expire/serv_expire.c
index d856761c8..e807f969b 100644
--- a/citadel/modules/expire/serv_expire.c
+++ b/citadel/modules/expire/serv_expire.c
@@ -720,11 +720,9 @@ void *purge_databases(void *args)
         time_t now;
         struct tm tm;
 
-        CT_PUSH();	// Makes it easier to access this threads structure
+	CtdlThreadAllocTSD();
 
-        cdb_allocate_tsd();
-
-        while (!CtdlThreadCheckStop(CT)) {
+        while (!CtdlThreadCheckStop()) {
                 /* Do the auto-purge if the current hour equals the purge hour,
                  * but not if the operation has already been performed in the
                  * last twelve hours.  This is usually enough granularity.
@@ -739,49 +737,49 @@ void *purge_databases(void *args)
 
                 lprintf(CTDL_INFO, "Auto-purger: starting.\n");
 
-		if (!CtdlThreadCheckStop(CT))
+		if (!CtdlThreadCheckStop())
 		{
 			retval = PurgeUsers();
                 	lprintf(CTDL_NOTICE, "Purged %d users.\n", retval);
 		}
 		
-		if (!CtdlThreadCheckStop(CT))
+		if (!CtdlThreadCheckStop())
 		{
                 	PurgeMessages();
                 	lprintf(CTDL_NOTICE, "Expired %d messages.\n", messages_purged);
 		}
 
-		if (!CtdlThreadCheckStop(CT))
+		if (!CtdlThreadCheckStop())
 		{
                 	retval = PurgeRooms();
                 	lprintf(CTDL_NOTICE, "Expired %d rooms.\n", retval);
 		}
 
-		if (!CtdlThreadCheckStop(CT))
+		if (!CtdlThreadCheckStop())
 		{
                 	retval = PurgeVisits();
                 	lprintf(CTDL_NOTICE, "Purged %d visits.\n", retval);
 		}
 
-		if (!CtdlThreadCheckStop(CT))
+		if (!CtdlThreadCheckStop())
 		{
 			retval = PurgeUseTable();
                 	lprintf(CTDL_NOTICE, "Purged %d entries from the use table.\n", retval);
 		}
 
-		if (!CtdlThreadCheckStop(CT))
+		if (!CtdlThreadCheckStop())
 		{
                 	retval = PurgeEuidIndexTable();
                 	lprintf(CTDL_NOTICE, "Purged %d entries from the EUID index.\n", retval);
 		}
 
-		if (!CtdlThreadCheckStop(CT))
+		if (!CtdlThreadCheckStop())
 		{
                 	retval = TDAP_ProcessAdjRefCountQueue();
                 	lprintf(CTDL_NOTICE, "Processed %d message reference count adjustments.\n", retval);
 		}
 
-		if (!CtdlThreadCheckStop(CT))
+		if (!CtdlThreadCheckStop())
 		{
                 	lprintf(CTDL_INFO, "Auto-purger: finished.\n");
 	                last_purge = now;	/* So we don't do it again soon */