Mercurial > hg > dav / file diff

--- a/libidav/webdav.h	Sun Apr 16 14:12:24 2023 +0200
+++ b/libidav/webdav.h	Fri Apr 21 21:25:32 2023 +0200
@@ -30,10 +30,11 @@
 #define	WEBDAV_H
 
 #include <inttypes.h>
-#include <ucx/map.h>
-#include <ucx/mempool.h>
-#include <ucx/list.h>
-#include <ucx/buffer.h>
+#include <cx/map.h>
+#include <cx/mempool.h>
+#include <cx/linked_list.h>
+#include <cx/string.h>
+#include <cx/buffer.h>
 #include <curl/curl.h>
 #include <libxml/tree.h>
 
@@ -148,8 +149,8 @@
     DavContext    *context;
     CURL          *handle;
     char          *base_url;
-    UcxMempool    *mp;
-    UcxMap        *pathcache;
+    CxMempool     *mp;
+    CxMap         *pathcache;
     DavKey        *key;
     void          *locks;
     uint32_t      flags;
@@ -165,10 +166,10 @@
 };
 
 struct DavContext {
-    UcxMap   *namespaces;
-    UcxMap   *namespaceinfo;
-    UcxMap   *keys;
-    UcxList  *sessions;
+    CxMap    *namespaces;
+    CxMap    *namespaceinfo;
+    CxMap    *keys;
+    CxList   *sessions;
     DavProxy *http_proxy;
     DavProxy *https_proxy;
 };
@@ -238,10 +239,11 @@
 void dav_context_destroy(DavContext *ctx);
 
 void dav_context_add_key(DavContext *context, DavKey *key);
-DavKey* dav_context_get_key(DavContext *context, char *name);
+DavKey* dav_context_get_key(DavContext *context, const char *name);
 
 int dav_add_namespace(DavContext *context, const char *prefix, const char *ns);
 DavNamespace* dav_get_namespace(DavContext *context, const char *prefix);
+DavNamespace* dav_get_namespace_s(DavContext *context, cxstring prefix);
 
 int dav_enable_namespace_encryption(DavContext *context, const char *ns, DavBool encrypt);
 int dav_namespace_is_encrypted(DavContext *context, const char *ns);
@@ -268,13 +270,13 @@
 char* dav_session_strdup(DavSession *sn, const char *str);
 
 void dav_set_effective_href(DavSession *sn, DavResource *resource);
-DavResource* dav_get(DavSession *sn, char *path, char *properties);
+DavResource* dav_get(DavSession *sn, char *path, const char *properties);
 
-UcxList* parse_properties_string(DavContext *context, sstr_t str);
+CxList* parse_properties_string(DavContext *context, cxstring str);
 
 DavResource* dav_query(DavSession *sn, char *query, ...);
 
-sstr_t dav_property_key(const char *ns, const char *name);
+cxmutstr dav_property_key(const char *ns, const char *name);
 void dav_get_property_namespace_str(
         DavContext *ctx,
         char *prefixed_name,
@@ -287,9 +289,9 @@
 
 /* ------------------------ resource functions ------------------------ */
 
-DavResource* dav_resource_new(DavSession *sn, char *path);
-DavResource* dav_resource_new_child(DavSession *sn, DavResource *parent, char *name);
-DavResource* dav_resource_new_href(DavSession *sn, char *href);
+DavResource* dav_resource_new(DavSession *sn, const char *path);
+DavResource* dav_resource_new_child(DavSession *sn, DavResource *parent, const char *name);
+DavResource* dav_resource_new_href(DavSession *sn, const char *href);
 
 void dav_resource_free(DavResource *res);
 void dav_resource_free_all(DavResource *res);
@@ -347,7 +349,7 @@
 int dav_outputstream_close(DavOutputStream *out);
 
 // private
-int dav_propfind(DavSession *sn, DavResource *root, UcxBuffer *rqbuf);
+int dav_propfind(DavSession *sn, DavResource *root, CxBuffer *rqbuf);
 
 
 /* --------------------------- DeltaV ---------------------------- */