sitemap now uses GetRoomListHash() which is what I should have used in the first...

[citadel.git] / webcit / sitemap.c

diff --git a/webcit/sitemap.c b/webcit/sitemap.c
index 37fe310a80ba696f69fc3dc6cc18bfea5e875be8..4d154632df09fd4cd1478e654b90f8511a813fae 100644 (file)
--- a/webcit/sitemap.c
+++ b/webcit/sitemap.c
@@ -129,11 +129,11 @@ void sitemap_do_wiki(void) {
  * Entry point for RSS feed generator
  */
 void sitemap(void) {
-       HashList *roomlist;
-       HashPos *it;
-       long HKlen;
-       const char *HashKey;
-       folder *room;
+       HashList *roomlist = NULL;
+       HashPos *it = NULL;
+       long HKlen = 0;
+       const char *HashKey = NULL;
+       folder *room = NULL;
 
        output_headers(0, 0, 0, 0, 1, 0);
        hprintf("Content-type: text/xml\r\n");
@@ -148,8 +148,10 @@ void sitemap(void) {
        wc_printf("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n");
        wc_printf("<urlset xmlns=\"http://www.sitemaps.org/schemas/sitemap/0.9\">\r\n");
 
-       roomlist = GetRoomListHashLKRA(NULL, NULL);
+       roomlist = GetRoomListHash(NULL, NULL);
+       if (!roomlist) syslog(LOG_CRIT, "GetRoomListHash() FAILED!");
        it = GetNewHashPos(roomlist, 0);
+       if (!it) syslog(LOG_CRIT, "GetNewHashPos() FAILED!");
 
        while (GetNextHashPos(roomlist, it, &HKlen, &HashKey, (void *)&room))
        {
@@ -172,8 +174,7 @@ void sitemap(void) {
        }
 
        DeleteHashPos(&it);
-       /* No need to DeleteHash(&roomlist) -- it will be freed when the session closes */
-
+       DeleteHash(&roomlist);
        wc_printf("</urlset>\r\n");
        wDumpContent(0);
 }