* Misc. routines converted to new IPC code

[citadel.git] / citadel / citadel.c

diff --git a/citadel/citadel.c b/citadel/citadel.c
index 93668df856664e640162353e4a57ca398399505b..e2ba5614c2841b582834184ffcd4189ada3f93b8 100644 (file)
--- a/citadel/citadel.c
+++ b/citadel/citadel.c
@@ -515,6 +515,8 @@ void forget_all_rooms_on(int ffloor)
 {
        char buf[SIZ];
        struct march *flist, *fptr;
+       struct ctdlipcroom *roomrec;    /* Ignored */
+       int r;                          /* IPC response code */
 
        scr_printf("Forgetting all rooms on %s...\r", &floorlist[ffloor][0]);
        scr_flush();
@@ -533,12 +535,9 @@ void forget_all_rooms_on(int ffloor)
                extract(fptr->march_name, buf, 0);
        }
        while (flist != NULL) {
-               snprintf(buf, sizeof buf, "GOTO %s", flist->march_name);
-               serv_puts(buf);
-               serv_gets(buf);
-               if (buf[0] == '2') {
-                       serv_puts("FORG");
-                       serv_gets(buf);
+               r = CtdlIPCGotoRoom(flist->march_name, "", &roomrec, buf);
+               if (r / 100 == 2) {
+                       r = CtdlIPCForgetRoom(buf);
                }
                fptr = flist;
                flist = flist->next;