Mercurial > hg > webserver / file diff

--- 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