And a few more things comply with the coding style.

[citadel.git] / citadel / room_ops.c

diff --git a/citadel/room_ops.c b/citadel/room_ops.c
index 1ef9f0a94cdd1d98c81b4b9f86997af0e84c6005..386c3c9947c184976dcaeb1af80decc824df2048 100644 (file)
--- a/citadel/room_ops.c
+++ b/citadel/room_ops.c
@@ -608,7 +608,7 @@ void cmd_lrms(char *argbuf)
 
        if (CtdlAccessCheck(ac_logged_in)) return;
 
-       if (getuser(&CC->user, CC->curr_user)) {
+       if (CtdlGetUser(&CC->user, CC->curr_user)) {
                cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR);
                return;
        }
@@ -646,7 +646,7 @@ void cmd_lkra(char *argbuf)
 
        if (CtdlAccessCheck(ac_logged_in)) return;
        
-       if (getuser(&CC->user, CC->curr_user)) {
+       if (CtdlGetUser(&CC->user, CC->curr_user)) {
                cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR);
                return;
        }
@@ -715,7 +715,7 @@ void cmd_lkrn(char *argbuf)
 
        if (CtdlAccessCheck(ac_logged_in)) return;
        
-       if (getuser(&CC->user, CC->curr_user)) {
+       if (CtdlGetUser(&CC->user, CC->curr_user)) {
                cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR);
                return;
        }
@@ -754,7 +754,7 @@ void cmd_lkro(char *argbuf)
 
        if (CtdlAccessCheck(ac_logged_in)) return;
        
-       if (getuser(&CC->user, CC->curr_user)) {
+       if (CtdlGetUser(&CC->user, CC->curr_user)) {
                cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR);
                return;
        }
@@ -793,7 +793,7 @@ void cmd_lzrm(char *argbuf)
 
        if (CtdlAccessCheck(ac_logged_in)) return;
        
-       if (getuser(&CC->user, CC->curr_user)) {
+       if (CtdlGetUser(&CC->user, CC->curr_user)) {
                cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR);
                return;
        }
@@ -1018,7 +1018,7 @@ void cmd_goto(char *gargs)
        extract_token(password, gargs, 1, '|', sizeof password);
        transiently = extract_int(gargs, 2);
 
-       getuser(&CC->user, CC->curr_user);
+       CtdlGetUser(&CC->user, CC->curr_user);
 
        /*
         * Handle some of the macro named rooms
@@ -1030,7 +1030,7 @@ void cmd_goto(char *gargs)
 
        /* Then try a mailbox name match */
        if (c != 0) {
-               MailboxName(augmented_roomname, sizeof augmented_roomname,
+               CtdlMailboxName(augmented_roomname, sizeof augmented_roomname,
                            &CC->user, towhere);
                c = CtdlGetRoom(&QRscratch, augmented_roomname);
                if (c == 0)
@@ -1133,7 +1133,7 @@ void cmd_rdir(char *cmdbuf)
        if (CtdlAccessCheck(ac_logged_in)) return;
        
        CtdlGetRoom(&CC->room, CC->room.QRname);
-       getuser(&CC->user, CC->curr_user);
+       CtdlGetUser(&CC->user, CC->curr_user);
 
        if ((CC->room.QRflags & QR_DIRECTORY) == 0) {
                cprintf("%d not here.\n", ERROR + NOT_HERE);
@@ -1512,7 +1512,7 @@ void cmd_geta(char *cmdbuf)
 
        if (CtdlAccessCheck(ac_logged_in)) return;
 
-       if (getuserbynumber(&usbuf, CC->room.QRroomaide) == 0) {
+       if (CtdlGetUserByNumber(&usbuf, CC->room.QRroomaide) == 0) {
                cprintf("%d %s\n", CIT_OK, usbuf.fullname);
        } else {
                cprintf("%d \n", CIT_OK);
@@ -1532,7 +1532,7 @@ void cmd_seta(char *new_ra)
 
        if (CtdlAccessCheck(ac_room_aide)) return;
 
-       if (getuser(&usbuf, new_ra) != 0) {
+       if (CtdlGetUser(&usbuf, new_ra) != 0) {
                newu = (-1L);
        } else {
                newu = usbuf.usernum;
@@ -1795,7 +1795,7 @@ unsigned CtdlCreateRoom(char *new_room_name,
         * name accordingly (prepend the user number)
         */
        if (new_room_type == 4) {
-               MailboxName(qrbuf.QRname, sizeof qrbuf.QRname, &CC->user, new_room_name);
+               CtdlMailboxName(qrbuf.QRname, sizeof qrbuf.QRname, &CC->user, new_room_name);
        }
        else {
                safestrncpy(qrbuf.QRname, new_room_name, sizeof qrbuf.QRname);