Mercurial > hg > webserver / file diff

--- a/src/server/config/objconf.c	Fri Jan 31 21:01:48 2025 +0100
+++ b/src/server/config/objconf.c	Fri Jan 31 21:27:54 2025 +0100
@@ -209,7 +209,7 @@
     begin->type = cfg_get_line_type(line);
     switch(begin->type) {
         case LINE_BEGIN_TAG: {
-            ConfigTag *tag = cfg_parse_begin_tag(line, conf->parser.mp);
+            ConfigTag *tag = cfg_parse_begin_tag(line, conf->parser.a);
             if(tag == NULL) {
                 ws_cfg_log(LOG_FAILURE, "Parse error in %s", conf->file);
                 exit(-1); // TODO: better error handling
@@ -236,7 +236,7 @@
         case LINE_DIRECTIVE: {
             ConfigDirective *dir = cfg_parse_directive(
                     line,
-                    conf->parser.mp);
+                    conf->parser.a);
             dir->begin = begin;
             dir->end = end;
             if(objconf_on_directive(conf, dir) != 0) {
@@ -249,7 +249,7 @@
 }
 
 int objconf_on_begin_tag(ObjectConfig *conf, ConfigTag *tag) {
-    CxAllocator *mp = conf->parser.mp;
+    CxAllocator *mp = conf->parser.a;
     if(tag->type_num != TAG_OBJECT) {
         ConfigParserLevel *l = conf->levels;
         if(l->tag->type_num != TAG_OBJECT) {
@@ -305,7 +305,7 @@
             tag->iftag = last_lvl->iftag;
 
             ConfigParserLevel *lvl = OBJ_NEW(
-                    conf->parser.mp,
+                    conf->parser.a,
                     ConfigParserLevel);
             
             lvl->iftag = last_lvl->tag;
@@ -372,7 +372,7 @@
             dir);
     */
     
-    ConfigDirectiveList *dir_entry = cxMalloc(conf->parser.mp, sizeof(ConfigDirectiveList));
+    ConfigDirectiveList *dir_entry = cxMalloc(conf->parser.a, sizeof(ConfigDirectiveList));
     dir_entry->directive = dir;
     dir_entry->next = NULL;
     CFG_DIRECTIVES_ADD(&conf->obj->directives[dir->type_num], dir_entry);