diff -r 99a34860c105 -r d938228c382e src/server/daemon/config.h --- a/src/server/daemon/config.h Wed Nov 02 19:19:01 2022 +0100 +++ b/src/server/daemon/config.h Sun Nov 06 15:53:32 2022 +0100 @@ -47,10 +47,10 @@ #include "../webdav/webdav.h" -#include -#include -#include -#include +#include +#include +#include +#include #ifdef __cplusplus extern "C" { @@ -67,27 +67,27 @@ } CfgManager; struct ServerConfiguration { - pool_handle_t *pool; - UcxAllocator *a; + pool_handle_t *pool; + CxAllocator *a; - UcxMap *host_vs; // map of all vservers. key is the host name - UcxList *listeners; // list of all listeners - UcxList *logfiles; - AccessLog *default_log; - UcxMap *authdbs; - MimeMap *mimetypes; - UcxMap *resources; - UcxMap *dav; - sstr_t tmp; - sstr_t user; - uint32_t ref; // reference counter + CxMap *host_vs; // map of all vservers. key is the host name + CxList *listeners; // list of all listeners + CxList *logfiles; + AccessLog *default_log; + CxMap *authdbs; + MimeMap *mimetypes; + CxMap *resources; + CxMap *dav; + cxmutstr tmp; + cxmutstr user; + uint32_t ref; // reference counter }; struct WebdavRepository { - VfsType *vfs; - void *vfsInitData; - UcxList *davBackends; // list of WebdavBackendInitData* - sstr_t object; + VfsType *vfs; + void *vfsInitData; + CxList *davBackends; // list of WebdavBackendInitData* + cxmutstr object; }; struct WebdavBackendInitData { @@ -96,7 +96,7 @@ }; struct mime_map { - UcxMap *map; + CxMap *map; }; char* cfg_config_file_path(const char *file); @@ -130,12 +130,12 @@ void cfg_ref(ServerConfiguration *cfg); void cfg_unref(ServerConfiguration *cfg); -HTTPObjectConfig* objconf_load(ServerConfiguration *scfg, sstr_t file); -int mime_conf_load(ServerConfiguration *cfg, sstr_t file); +HTTPObjectConfig* objconf_load(ServerConfiguration *scfg, cxmutstr file); +int mime_conf_load(ServerConfiguration *cfg, cxmutstr file); -ACLData* acl_conf_load(ServerConfiguration *cfg, sstr_t file); +ACLData* acl_conf_load(ServerConfiguration *cfg, const char *file); ACLList* acl_config_convert(ServerConfiguration *cfg, ACLConfig *acl); -AuthDB* keyfile_load(ServerConfiguration *cfg, scstr_t file); +AuthDB* keyfile_load(ServerConfiguration *cfg, cxstring file); pblock* config_obj2pblock(pool_handle_t *pool, ConfigNode *obj);