--- a/dav/config.h Sun Apr 16 14:12:24 2023 +0200 +++ b/dav/config.h Fri Apr 21 21:25:32 2023 +0200 @@ -29,7 +29,7 @@ #ifndef CONFIG_H #define CONFIG_H -#include <ucx/string.h> +#include <cx/string.h> #include <stdbool.h> #include <libidav/webdav.h> #include "pwd.h" @@ -81,28 +81,28 @@ int load_repository(const xmlNode *reponode); int load_key(const xmlNode *keynode); int load_proxy(DavProxy*, const xmlNode *proxynode, int type); -sstr_t load_key_file(char *filename); +cxmutstr load_key_file(const char *filename); int load_namespace(const xmlNode *node); int load_secretstore(const xmlNode *node); Repository* repository_new(void); -Repository* get_repository(sstr_t name); +Repository* get_repository(cxstring name); int get_repository_flags(Repository *repo); DavSession *repository_session(Repository *repo); -Key* get_key(char *name); +Key* get_key(const char *name); int add_repository(Repository *repo); int remove_repository(Repository *repo); int list_repositories(void); -UcxList* get_repositories(void); +CxIterator get_repositories(void); PwdStore* get_pwdstore(void); int pwdstore_save(PwdStore *pwdstore); -Repository* url2repo_s(sstr_t url, char **path); -Repository* url2repo(char *url, char **path); +Repository* url2repo_s(cxstring url, char **path); +Repository* url2repo(const char *url, char **path); DavSession* connect_to_repo(DavContext *ctx, Repository *repo, char *path, dav_auth_func authfunc, CmdArgs *a);