Mercurial > hg > webserver / changeset

--- a/src/server/config/objconf.c	Wed Nov 12 18:15:26 2025 +0100
+++ b/src/server/config/objconf.c	Wed Nov 12 18:18:05 2025 +0100
@@ -41,7 +41,7 @@
  */
 
 
-ObjectConfig2* objectconf_load(const char *file) {
+ObjectConfig* objectconf_load(const char *file) {
     CxMempool *mp = cxMempoolCreateSimple(512);
     if(!mp) {
         return NULL;
@@ -64,7 +64,7 @@
         return NULL;
     }
     
-    ObjectConfig2 *conf = cxMalloc(mp->allocator, sizeof(ObjectConfig2));
+    ObjectConfig *conf = cxMalloc(mp->allocator, sizeof(ObjectConfig));
     if(!conf) {
         cxMempoolFree(mp);
         return NULL;
@@ -76,7 +76,7 @@
     return conf;
 }
 
-void objectconf_free(ObjectConfig2 *objconf) {
+void objectconf_free(ObjectConfig *objconf) {
     cxMempoolFree(objconf->mp);
 }
 
@@ -189,14 +189,3 @@
 }
 
 
-void free_object_config(ObjectConfig *conf) {
-    // free other lists
-    if(conf->levels) {
-        //ucx_list_free(conf->levels);
-    }
-
-    // free mempool
-    //ucx_mempool_destroy(conf->parser.mp->pool);
-    free(conf);
-}
-

--- a/src/server/config/objconf.h	Wed Nov 12 18:15:26 2025 +0100
+++ b/src/server/config/objconf.h	Wed Nov 12 18:18:05 2025 +0100
@@ -62,29 +62,15 @@
     ConfigParserLevel *next;
 };
 
-typedef struct _obj_conf {
-    ConfigParser parser;
-    char         *file;
-    //UcxDlist     *lines;
-    //UcxList      *conditions;
-    CxList      *objects;
 
-    // private parser temp var
-    ConfigObject *obj;     // add directives to this object
-    // private parser temp var
-    ConfigParserLevel     *levels;  // tree levels (stack)
-    
+typedef struct ObjectConfig {
+    CxMempool  *mp;
+    ConfigNode *root;
 } ObjectConfig;
 
-// TODO: rename to ObjectConfig after old ObjectConfig is removed
-typedef struct ObjectConfig2 {
-    CxMempool  *mp;
-    ConfigNode *root;
-} ObjectConfig2;
+ObjectConfig* objectconf_load(const char *file);
 
-ObjectConfig2* objectconf_load(const char *file);
-
-void objectconf_free(ObjectConfig2 *objconf);
+void objectconf_free(ObjectConfig *objconf);
 
 int objectconf_validate_directive(ConfigParser2 *parser, ConfigNode *node);
 
@@ -93,8 +79,6 @@
 int objectconf_validate_objend(ConfigParser2 *parser, ConfigNode *node);
 
 
-void free_object_config(ObjectConfig *conf);
-
 
 
 #ifdef	__cplusplus

--- a/src/server/daemon/config.c	Wed Nov 12 18:15:26 2025 +0100
+++ b/src/server/daemon/config.c	Wed Nov 12 18:18:05 2025 +0100
@@ -1047,7 +1047,7 @@
     return 0;
 }
 
-static int convert_objconf(ServerConfiguration *scfg, ObjectConfig2 *cfg, HTTPObjectConfig *conf, cxmutstr file) {
+static int convert_objconf(ServerConfiguration *scfg, ObjectConfig *cfg, HTTPObjectConfig *conf, cxmutstr file) {
     pool_handle_t *pool = conf->pool;
     
     int condition_index = 0;
@@ -1116,7 +1116,7 @@
     conf->pool = pool;
     
     // load obj config file
-    ObjectConfig2 *cfg = objectconf_load(file.ptr);
+    ObjectConfig *cfg = objectconf_load(file.ptr);
     if(!cfg) {
         return NULL;
     }