And a few more things comply with the coding style.

[citadel.git] / citadel / modules / upgrade / serv_upgrade.c

diff --git a/citadel/modules/upgrade/serv_upgrade.c b/citadel/modules/upgrade/serv_upgrade.c
index ae5c8da11b7b35ef806ea7ca6ba45f74467c49df..de3eb9ab5227d7e17566f40279dad05f084513bb 100644 (file)
--- a/citadel/modules/upgrade/serv_upgrade.c
+++ b/citadel/modules/upgrade/serv_upgrade.c
@@ -52,7 +52,6 @@
 #include "config.h"
 #include "control.h"
 #include "database.h"
-#include "room_ops.h"
 #include "user_ops.h"
 #include "msgbase.h"
 #include "serv_upgrade.h"
@@ -72,12 +71,12 @@ void fix_sys_user_name(void)
        char usernamekey[USERNAME_SIZE];
 
        /** If we have a user called Citadel rename them to SYS_Citadel */
-       if (getuser(&usbuf, "Citadel") == 0)
+       if (CtdlGetUser(&usbuf, "Citadel") == 0)
        {
                rename_user("Citadel", "SYS_Citadel");
        }
 
-       while (getuserbynumber(&usbuf, 0) == 0)
+       while (CtdlGetUserByNumber(&usbuf, 0) == 0)
        {
                /* delete user with number 0 and no name */
                if (IsEmptyStr(usbuf.fullname))
@@ -85,12 +84,12 @@ void fix_sys_user_name(void)
                else
                { /* temporarily set this user to -1 */
                        usbuf.usernum = -1;
-                       putuser(&usbuf);
+                       CtdlPutUser(&usbuf);
                }
        }
 
        /** Make sure user SYS_* is user 0 */
-       while (getuserbynumber(&usbuf, -1) == 0)
+       while (CtdlGetUserByNumber(&usbuf, -1) == 0)
        {
                if (strncmp(usbuf.fullname, "SYS_", 4))
                {       /** Delete any user 0 that doesn't start with SYS_ */
@@ -100,7 +99,7 @@ void fix_sys_user_name(void)
                else
                {
                        usbuf.usernum = 0;
-                       putuser(&usbuf);
+                       CtdlPutUser(&usbuf);
                }
        }
 }
@@ -114,7 +113,7 @@ void cmd_bmbx_backend(struct ctdlroom *qrbuf, void *data) {
        struct RoomProcList *ptr;
        struct ctdlroom qr;
 
-       /* Lazy programming here.  Call this function as a ForEachRoom backend
+       /* Lazy programming here.  Call this function as a CtdlForEachRoom backend
         * in order to queue up the room names, or call it with a null room
         * to make it do the processing.
         */
@@ -131,7 +130,7 @@ void cmd_bmbx_backend(struct ctdlroom *qrbuf, void *data) {
 
        while (rplist != NULL) {
 
-               if (lgetroom(&qr, rplist->name) == 0) {
+               if (CtdlGetRoomLock(&qr, rplist->name) == 0) {
                        CtdlLogPrintf(CTDL_DEBUG, "Processing <%s>...\n", rplist->name);
                        if ( (qr.QRflags & QR_MAILBOX) == 0) {
                                CtdlLogPrintf(CTDL_DEBUG, "  -- not a mailbox\n");
@@ -141,7 +140,7 @@ void cmd_bmbx_backend(struct ctdlroom *qrbuf, void *data) {
                                qr.QRgen = time(NULL);
                                CtdlLogPrintf(CTDL_DEBUG, "  -- fixed!\n");
                        }
-                       lputroom(&qr);
+                       CtdlPutRoomLock(&qr);
                }
 
                ptr = rplist;
@@ -155,7 +154,7 @@ void cmd_bmbx_backend(struct ctdlroom *qrbuf, void *data) {
  */
 void bump_mailbox_generation_numbers(void) {
        CtdlLogPrintf(CTDL_WARNING, "Applying security fix to mailbox rooms\n");
-       ForEachRoom(cmd_bmbx_backend, NULL);
+       CtdlForEachRoom(cmd_bmbx_backend, NULL);
        cmd_bmbx_backend(NULL, NULL);
        return;
 }
@@ -186,12 +185,12 @@ void cbtm_backend(struct ctdluser *usbuf, void *data) {
 
        while (uplist != NULL) {
 
-               if (lgetuser(&us, uplist->user) == 0) {
+               if (CtdlGetUserLock(&us, uplist->user) == 0) {
                        CtdlLogPrintf(CTDL_DEBUG, "Processing <%s>...\n", uplist->user);
                        if (us.uid == CTDLUID) {
                                us.uid = (-1);
                        }
-                       lputuser(&us);
+                       CtdlPutUserLock(&us);
                }
 
                ptr = uplist;