Mercurial > hg > webserver / file diff

--- a/src/server/config/initconf.c	Tue Jun 25 22:18:59 2013 +0200
+++ b/src/server/config/initconf.c	Wed Jun 26 15:09:54 2013 +0200
@@ -44,6 +44,7 @@
     conf->directives = NULL;
 
     int r = cfg_parse_basic_file((ConfigParser*)conf, in);
+    cfg_dlist_destr(conf->parser.mp, conf->directives);
     if(r != 0) {
         // TODO: free
         return NULL;
@@ -55,12 +56,6 @@
 }
 
 void free_init_config(InitConfig *conf) {
-    if(conf->directives != NULL) {
-        ucx_dlist_free(conf->directives);
-    }
-    if(conf->parser.lines != NULL) {
-        ucx_dlist_free(conf->parser.lines);
-    }
     ucx_mempool_free(conf->parser.mp);
     free(conf);
 }