diff -r a569148841ff -r efbd59642577 libidav/resource.h
--- a/libidav/resource.h	Sun Apr 16 14:12:24 2023 +0200
+++ b/libidav/resource.h	Fri Apr 21 21:25:32 2023 +0200
@@ -31,7 +31,8 @@
 
 #include "webdav.h"
 #include "crypto.h"
-#include <ucx/string.h>
+#include <cx/string.h>
+#include <cx/hash_key.h>
 
 #ifdef	__cplusplus
 extern "C" {
@@ -40,16 +41,16 @@
 typedef struct DavResourceData   DavResourceData;
 
 struct DavResourceData {
-    UcxMap  *properties;
-    UcxList *set;
-    UcxList *remove;
-    UcxList *crypto_set;
-    UcxList *crypto_remove;
+    CxMap  *properties;
+    CxList *set;
+    CxList *remove;
+    CxList *crypto_set;
+    CxList *crypto_remove;
     
     /*
      * properties encapsulated in a crypto-prop property or NULL
      */
-    UcxMap *crypto_properties;
+    CxMap *crypto_properties;
     
     /*
      * char* or stream
@@ -58,7 +59,7 @@
     /*
      * if NULL, content is a char*
      */
-    read_func read;
+    dav_read_func read;
     /*
      * curl seek func
      */
@@ -109,29 +110,29 @@
     int eof;
 };
 
-DavResource* dav_resource_new_full(DavSession *sn, char *parent_path, char *name, char *href);
+DavResource* dav_resource_new_full(DavSession *sn, const char *parent_path, const char *name, char *href);
 
-void resource_free_properties(DavSession *sn, UcxMap *properties);
+void resource_free_properties(DavSession *sn, CxMap *properties);
 
-void resource_set_href(DavResource *res, sstr_t href);
+void resource_set_href(DavResource *res, cxstring href);
 
-void resource_set_info(DavResource *res, char *href_str);
+void resource_set_info(DavResource *res, const char *href_str);
 DavResourceData* resource_data_new(DavSession *sn);
 void resource_add_property(DavResource *res, const char *ns, const char *name, xmlNode *val);
-void resource_set_crypto_properties(DavResource *res, UcxMap *cprops);
+void resource_set_crypto_properties(DavResource *res, CxMap *cprops);
 DavXmlNode* resource_get_property(DavResource *res, const char *ns, const char *name);
 DavXmlNode* resource_get_encrypted_property(DavResource *res, const char *ns, const char *name);
-DavXmlNode* resource_get_property_k(DavResource *res, UcxKey key);
-DavXmlNode* resource_get_encrypted_property_k(DavResource *res, UcxKey key);
+DavXmlNode* resource_get_property_k(DavResource *res, CxHashKey key);
+DavXmlNode* resource_get_encrypted_property_k(DavResource *res, CxHashKey key);
 void resource_add_child(DavResource *parent, DavResource *child);
-void resource_add_ordered_child(DavResource *parent, DavResource *child, UcxList *ordercr);
+void resource_add_ordered_child(DavResource *parent, DavResource *child, CxList *ordercr);
 int resource_add_crypto_info(DavSession *sn, const char *href, const char *name, const char *hash);
 
-sstr_t dav_property_key_a(UcxAllocator *a, const char *ns, const char *name);
+cxmutstr dav_property_key_a(const CxAllocator *a, const char *ns, const char *name);
 
-DavXmlNode* create_crypto_prop(DavSession *sn, UcxMap *properties);
-UcxMap* parse_crypto_prop(DavSession *sn, DavKey *key, DavXmlNode *node);
-UcxMap* parse_crypto_prop_str(DavSession *sn, DavKey *key, const char *content);
+DavXmlNode* create_crypto_prop(DavSession *sn, CxMap *properties);
+CxMap* parse_crypto_prop(DavSession *sn, DavKey *key, DavXmlNode *node);
+CxMap* parse_crypto_prop_str(DavSession *sn, DavKey *key, const char *content);
 
 #ifdef	__cplusplus
 }