* Renamed "dynloader" to "serv_extensions" globally. We don't want people

[citadel.git] / citadel / serv_expire.c

diff --git a/citadel/serv_expire.c b/citadel/serv_expire.c
index 7c9965ad54cbd14f01f06a134e1a4ef40675a54b..83a39308a7351268acfc13f08e283aa6aece282c 100644 (file)
--- a/citadel/serv_expire.c
+++ b/citadel/serv_expire.c
@@ -56,7 +56,7 @@
 #include "citserver.h"
 #include "support.h"
 #include "config.h"
-#include "dynloader.h"
+#include "serv_extensions.h"
 #include "room_ops.h"
 #include "policy.h"
 #include "database.h"
@@ -364,7 +364,7 @@ void do_user_purge(struct usersupp *us, void *data) {
        struct quickroom qrbuf;
        char mailboxname[ROOMNAMELEN];
        MailboxName(mailboxname, us, MAILROOM);
-       create_room(mailboxname, 4, "", 0, 1);
+       create_room(mailboxname, 4, "", 0, 1, 1);
        if (getroom(&qrbuf, mailboxname) != 0) return;
        lprintf(9, "Got %s\n", qrbuf.QRname);
         */
@@ -604,31 +604,31 @@ void cmd_expi(char *argbuf) {
        extract(cmd, argbuf, 0);
        if (!strcasecmp(cmd, "users")) {
                retval = PurgeUsers();
-               cprintf("%d Purged %d users.\n", OK, retval);
+               cprintf("%d Purged %d users.\n", CIT_OK, retval);
                return;
        }
        else if (!strcasecmp(cmd, "messages")) {
                PurgeMessages();
-               cprintf("%d Expired %d messages.\n", OK, messages_purged);
+               cprintf("%d Expired %d messages.\n", CIT_OK, messages_purged);
                return;
        }
        else if (!strcasecmp(cmd, "rooms")) {
                retval = PurgeRooms();
-               cprintf("%d Expired %d rooms.\n", OK, retval);
+               cprintf("%d Expired %d rooms.\n", CIT_OK, retval);
                return;
        }
        else if (!strcasecmp(cmd, "visits")) {
                retval = PurgeVisits();
-               cprintf("%d Purged %d visits.\n", OK, retval);
+               cprintf("%d Purged %d visits.\n", CIT_OK, retval);
        }
        else if (!strcasecmp(cmd, "usetable")) {
                retval = PurgeUseTable();
                cprintf("%d Purged %d entries from the use table.\n",
-                       OK, retval);
+                       CIT_OK, retval);
        }
        else if (!strcasecmp(cmd, "defrag")) {
                defrag_databases();
-               cprintf("%d Defragmented the databases.\n", OK);
+               cprintf("%d Defragmented the databases.\n", CIT_OK);
        }
        else {
                cprintf("%d Invalid command.\n", ERROR+ILLEGAL_VALUE);
@@ -651,8 +651,7 @@ void do_fsck_msg(long msgnum, void *userdata) {
 void do_fsck_room(struct quickroom *qrbuf, void *data)
 {
        getroom(&CC->quickroom, qrbuf->QRname);
-       CtdlForEachMessage(MSGS_ALL, 0L, (-127), NULL, NULL,
-               do_fsck_msg, NULL);
+       CtdlForEachMessage(MSGS_ALL, 0L, NULL, NULL, do_fsck_msg, NULL);
 }
 
 /*
@@ -725,7 +724,7 @@ void cmd_fsck(char *argbuf) {
 
 /*****************************************************************************/
 
-char *Dynamic_Module_Init(void)
+char *serv_expire_init(void)
 {
        CtdlRegisterProtoHook(cmd_expi, "EXPI", "Expire old system objects");
        CtdlRegisterProtoHook(cmd_fsck, "FSCK", "Check message ref counts");