Removed an unrequired extern declaration

[citadel.git] / citadel / modules / expire / serv_expire.c

diff --git a/citadel/modules/expire/serv_expire.c b/citadel/modules/expire/serv_expire.c
index 00869827d0a0e1edd742cc987c66dfae773a2728..8e0cd0077f542b832529dbb48eae687882b5160f 100644 (file)
--- a/citadel/modules/expire/serv_expire.c
+++ b/citadel/modules/expire/serv_expire.c
@@ -82,6 +82,7 @@
 #include "control.h"
 #include "serv_network.h"      /* Needed for definition of UseTable */
 #include "threads.h"
+#include "context.h"
 
 #include "ctdl_module.h"
 
@@ -136,7 +137,6 @@ int users_not_purged;
 char *users_corrupt_msg = NULL;
 char *users_zero_msg = NULL;
 struct ctdlroomref *rr = NULL;
-extern struct CitContext *ContextList;
 int force_purge_now = 0;                       /* set to nonzero to force a run right now */
 
 
@@ -378,7 +378,7 @@ int PurgeRooms(void) {
                ++num_rooms_purged;
        }
 
-       if (num_rooms_purged > 0) aide_message(transcript, "Room Autopurger Message");
+       if (num_rooms_purged > 0) CtdlAideMessage(transcript, "Room Autopurger Message");
        free(transcript);
 
        CtdlLogPrintf(CTDL_DEBUG, "Purged %d rooms.\n", num_rooms_purged);
@@ -578,19 +578,19 @@ int PurgeUsers(void) {
                }
        }
 
-       if (num_users_purged > 0) aide_message(transcript, "User Purge Message");
+       if (num_users_purged > 0) CtdlAideMessage(transcript, "User Purge Message");
        free(transcript);
 
        if(users_corrupt_msg)
        {
-               aide_message(users_corrupt_msg, "User Corruption Message");
+               CtdlAideMessage(users_corrupt_msg, "User Corruption Message");
                free (users_corrupt_msg);
                users_corrupt_msg = NULL;
        }
        
        if(users_zero_msg)
        {
-               aide_message(users_zero_msg, "User Zero Message");
+               CtdlAideMessage(users_zero_msg, "User Zero Message");
                free (users_zero_msg);
                users_zero_msg = NULL;
        }
@@ -829,7 +829,7 @@ int PurgeStaleOpenIDassociations(void) {
        while (cdboi = cdb_next_item(CDB_OPENID), cdboi != NULL) {
                if (cdboi->len > sizeof(long)) {
                        memcpy(&usernum, cdboi->ptr, sizeof(long));
-                       if (getuserbynumber(&usbuf, usernum) != 0) {
+                       if (CtdlGetUserByNumber(&usbuf, usernum) != 0) {
                                deleteme = strdup(cdboi->ptr + sizeof(long)),
                                Put(keys, deleteme, strlen(deleteme), deleteme, generic_free_handler);
                        }