--- a/libidav/session.h Sun Apr 16 14:12:24 2023 +0200 +++ b/libidav/session.h Fri Apr 21 21:25:32 2023 +0200 @@ -29,7 +29,7 @@ #ifndef DAV_SESSION_H #define DAV_SESSION_H -#include <ucx/buffer.h> +#include <cx/buffer.h> #include "webdav.h" #ifdef __cplusplus @@ -74,19 +74,19 @@ } DavPathCacheElement; */ -typedef struct DavLock { +typedef struct DavLock DavLock; +struct DavLock { char *path; char *token; - -} DavLock; +}; typedef struct DavLockManager { - UcxMap *resource_locks; - UcxList *collection_locks; + CxMap *resource_locks; + CxList *collection_locks; } DavLockManager; CURLcode dav_session_curl_perform(DavSession *sn, long *status); -CURLcode dav_session_curl_perform_buf(DavSession *sn, UcxBuffer *request, UcxBuffer *response, long *status); +CURLcode dav_session_curl_perform_buf(DavSession *sn, CxBuffer *request, CxBuffer *response, long *status); int dav_session_get_progress(void *clientp, curl_off_t dltotal, curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow); int dav_session_put_progress(void *clientp, curl_off_t dltotal, curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow); @@ -94,23 +94,23 @@ void dav_session_set_error(DavSession *sn, CURLcode c, int status); void dav_session_set_errstr(DavSession *sn, const char *str); -char* dav_session_create_plain_href(DavSession *sn, char *path); +char* dav_session_create_plain_href(DavSession *sn, const char *path); -char* dav_session_get_href(DavSession *sn, char *path); +char* dav_session_get_href(DavSession *sn, const char *path); -DavResource* dav_find_child(DavSession *sn, DavResource *res, UcxBuffer *rqbuf, char *name); +DavResource* dav_find_child(DavSession *sn, DavResource *res, CxBuffer *rqbuf, const char *name); -void dav_session_cache_path(DavSession *sn, sstr_t path, sstr_t href); +void dav_session_cache_path(DavSession *sn, cxstring path, cxstring href); -DavLock* dav_create_lock(DavSession *sn, char *token, char *timeout); +DavLock* dav_create_lock(DavSession *sn, const char *token, char *timeout); void dav_destroy_lock(DavSession *sn, DavLock *lock); -int dav_add_resource_lock(DavSession *sn, char *path, DavLock *lock); -int dav_add_collection_lock(DavSession *sn, char *path, DavLock *lock); +int dav_add_resource_lock(DavSession *sn, const char *path, DavLock *lock); +int dav_add_collection_lock(DavSession *sn, const char *path, DavLock *lock); -DavLock* dav_get_lock(DavSession *sn, char *path); -void dav_remove_lock(DavSession *sn, char *path, DavLock *lock); +DavLock* dav_get_lock(DavSession *sn, const char *path); +void dav_remove_lock(DavSession *sn, const char *path, DavLock *lock); #ifdef __cplusplus }