* cleanup shutdown procedure; free all structures and their properties

[citadel.git] / webcit / webserver.c

diff --git a/webcit/webserver.c b/webcit/webserver.c
index 6f8105997d09603880aba78e7eaa95734c678998..36c64a5f4155863c1dc82c815361cb49216de463 100644 (file)
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -619,6 +619,7 @@ int main(int argc, char **argv)
        TemplateCache = NewHash(1, NULL);
        GlobalNS = NewHash(1, NULL);
        Iterators = NewHash(1, NULL);
+       Contitionals = NewHash(1, NULL);
        LoadZoneFiles();
 
 
@@ -872,6 +873,27 @@ int main(int argc, char **argv)
 }
 
 
+void ShutDownWebcit(void)
+{
+       DeleteHash(&ZoneHash);
+       free_zone_directory ();
+       icaltimezone_release_zone_tab ();
+       icalmemory_free_ring ();
+       ShutDownLibCitadel ();
+       DeleteHash(&HandlerHash);
+       DeleteHash(&PreferenceHooks);
+       DeleteHash(&GlobalNS);
+       DeleteHash(&WirelessTemplateCache);
+       DeleteHash(&WirelessLocalTemplateCache);
+       DeleteHash(&TemplateCache);
+       DeleteHash(&LocalTemplateCache);
+       DeleteHash(&Iterators);
+       DeleteHash(&Contitionals);
+#ifdef ENABLE_NLS
+       ShutdownLocale();
+#endif
+}
+
 /*
  * Entry point for worker threads
  */
@@ -939,21 +961,9 @@ void worker_entry(void)
                                lprintf(2, "master shutdown: cleaning up sessions\n");
                                do_housekeeping();
                                lprintf(2, "master shutdown: cleaning up libical\n");
-                               free_zone_directory ();
-                               icaltimezone_release_zone_tab ();
-                               icalmemory_free_ring ();
-                               ShutDownLibCitadel ();
-                               DeleteHash(&HandlerHash);
-                               DeleteHash(&PreferenceHooks);
-                               DeleteHash(&GlobalNS);
-                               DeleteHash(&WirelessTemplateCache);
-                               DeleteHash(&WirelessLocalTemplateCache);
-                               DeleteHash(&TemplateCache);
-                               DeleteHash(&LocalTemplateCache);
-                               DeleteHash(&Iterators);
-#ifdef ENABLE_NLS
-                               void ShutdownLocale(void);
-#endif
+
+                               ShutDownWebcit();
+
                                lprintf(2, "master shutdown exiting!.\n");                              
                                exit(0);
                        }