* create function to parse the output of goto into our folder structure

[citadel.git] / webcit / roomlist.c

diff --git a/webcit/roomlist.c b/webcit/roomlist.c
index fe7183db1f28b3ecbfbb78c05dab6b09c80ff471..c440085f09caf9a4f5d69f770de4a50558a0ae30 100644 (file)
--- a/webcit/roomlist.c
+++ b/webcit/roomlist.c
@@ -125,20 +125,26 @@ HashList *GetRoomListHashLKRA(StrBuf *Target, WCTemplputParams *TP)
        return GetRoomListHash(Target, TP);
 }
 
-void DeleteFolder(void *vFolder)
+void FlushFolder(folder *room)
 {
        int i;
-       folder *room;
-       room = (folder*) vFolder;
 
        FreeStrBuf(&room->name);
-
        if (room->RoomNameParts != NULL)
        {
                for (i=0; i < room->nRoomNameParts; i++)
                        FreeStrBuf(&room->RoomNameParts[i]);
                free(room->RoomNameParts);
        }
+}
+
+void vDeleteFolder(void *vFolder)
+{
+       folder *room;
+
+       room = (folder*) vFolder;
+       FlushFolder(room);
+
        free(room);
 }
 
@@ -232,7 +238,7 @@ HashList *GetRoomListHash(StrBuf *Target, WCTemplputParams *TP)
 
 
                                /* now we know everything, remember it... */
-                               Put(rooms, SKEY(room->name), room, DeleteFolder);
+                               Put(rooms, SKEY(room->name), room, vDeleteFolder);
                        }
        }