comparison: src/server/config/objconf.h
src/server/config/objconf.h
- changeset 419
- f1d29785ad2d
- parent 415
- d938228c382e
equal
deleted
inserted
replaced
| 418:b7dcc9c4f270 | 419:f1d29785ad2d |
|---|---|
| 28 | 28 |
| 29 #ifndef OBJCONF_H | 29 #ifndef OBJCONF_H |
| 30 #define OBJCONF_H | 30 #define OBJCONF_H |
| 31 | 31 |
| 32 #include "conf.h" | 32 #include "conf.h" |
| 33 | |
| 34 | |
| 35 #include "serverconfig.h" | |
| 33 | 36 |
| 34 #ifdef __cplusplus | 37 #ifdef __cplusplus |
| 35 extern "C" { | 38 extern "C" { |
| 36 #endif | 39 #endif |
| 37 | 40 |
| 71 // private parser temp var | 74 // private parser temp var |
| 72 ConfigParserLevel *levels; // tree levels (stack) | 75 ConfigParserLevel *levels; // tree levels (stack) |
| 73 | 76 |
| 74 } ObjectConfig; | 77 } ObjectConfig; |
| 75 | 78 |
| 79 // TODO: rename to ObjectConfig after old ObjectConfig is removed | |
| 80 typedef struct ObjectConfig2 { | |
| 81 CxMempool *mp; | |
| 82 ConfigNode *root; | |
| 83 } ObjectConfig2; | |
| 84 | |
| 85 ObjectConfig2* objectconf_load(const char *file); | |
| 86 | |
| 87 void objectconf_free(ObjectConfig2 *objconf); | |
| 88 | |
| 89 int objectconf_validate_directive(ConfigParser2 *parser, ConfigNode *node); | |
| 90 | |
| 91 int objectconf_validate_objbegin(ConfigParser2 *parser, ConfigNode *node); | |
| 92 | |
| 93 int objectconf_validate_objend(ConfigParser2 *parser, ConfigNode *node); | |
| 94 | |
| 95 | |
| 96 | |
| 76 ObjectConfig *load_object_config(char *file); | 97 ObjectConfig *load_object_config(char *file); |
| 77 | 98 |
| 78 void free_object_config(ObjectConfig *conf); | 99 void free_object_config(ObjectConfig *conf); |
| 79 | 100 |
| 80 int objconf_parse(void *p, ConfigLine *begin, ConfigLine *end, cxmutstr line); | 101 int objconf_parse(void *p, ConfigLine *begin, ConfigLine *end, cxmutstr line); |
