Mercurial > hg > dav / file diff

--- a/libidav/methods.h	Sun Apr 16 14:12:24 2023 +0200
+++ b/libidav/methods.h	Fri Apr 21 21:25:32 2023 +0200
@@ -32,7 +32,7 @@
 #include "webdav.h"
 #include "resource.h"
 
-#include <ucx/list.h>
+#include <cx/list.h>
 
 #ifdef	__cplusplus
 extern "C" {
@@ -48,11 +48,11 @@
 };
 
 struct ResponseTag {
-    char    *href;
-    int     iscollection;
-    UcxList *properties;
-    char    *crypto_name;
-    char    *crypto_key;
+    const char *href;
+    int        iscollection;
+    CxList     *properties;
+    const char *crypto_name;
+    const char *crypto_key;
 };
 
 struct LockDiscovery {
@@ -60,18 +60,18 @@
     char    *locktoken;
 };
 
-int dav_buffer_seek(UcxBuffer *b, curl_off_t offset, int origin);
+int dav_buffer_seek(CxBuffer *b, curl_off_t offset, int origin);
 
 CURLcode do_propfind_request(
         DavSession *sn,
-        UcxBuffer *request,
-        UcxBuffer *response);
+        CxBuffer *request,
+        CxBuffer *response);
 
 CURLcode do_proppatch_request(
         DavSession *sn,
         char *lock,
-        UcxBuffer *request,
-        UcxBuffer *response);
+        CxBuffer *request,
+        CxBuffer *response);
 
 CURLcode do_put_request(
         DavSession *sn,
@@ -82,21 +82,21 @@
         dav_seek_func seek_func,
         size_t length);
 
-UcxBuffer* create_allprop_propfind_request(void);
-UcxBuffer* create_cryptoprop_propfind_request(void);
-UcxBuffer* create_propfind_request(DavSession *sn, UcxList *properties, char *rootelm, DavBool nocrypt);
-UcxBuffer* create_basic_propfind_request(void);
+CxBuffer* create_allprop_propfind_request(void);
+CxBuffer* create_cryptoprop_propfind_request(void);
+CxBuffer* create_propfind_request(DavSession *sn, CxList *properties, char *rootelm, DavBool nocrypt);
+CxBuffer* create_basic_propfind_request(void);
 
-PropfindParser* create_propfind_parser(UcxBuffer *response, char *url);
+PropfindParser* create_propfind_parser(CxBuffer *response, char *url);
 void destroy_propfind_parser(PropfindParser *parser);
 int get_propfind_response(PropfindParser *parser, ResponseTag *result);
 void cleanup_response(ResponseTag *result);
 
-int hrefeq(DavSession *sn, char *href1, char *href2);
+int hrefeq(DavSession *sn, const char *href1, const char *href2);
 DavResource* response2resource(DavSession *sn, ResponseTag *response, char *parent_path);
 void add_properties(DavResource *res, ResponseTag *response);
 
-DavResource* parse_propfind_response(DavSession *sn, DavResource *root, UcxBuffer *response);
+DavResource* parse_propfind_response(DavSession *sn, DavResource *root, CxBuffer *response);
 int parse_response_tag(DavResource *resource, xmlNode *node);
 void set_davprops(DavResource *res);
 
@@ -106,10 +106,10 @@
  */
 int parse_resource_type(xmlNode *node);
 
-UcxBuffer* create_proppatch_request(DavResourceData *data);
-UcxBuffer* create_crypto_proppatch_request(DavSession *sn, DavKey *key, const char *name, const char *hash);
+CxBuffer* create_proppatch_request(DavResourceData *data);
+CxBuffer* create_crypto_proppatch_request(DavSession *sn, DavKey *key, const char *name, const char *hash);
 
-CURLcode do_delete_request(DavSession *sn, char *lock, UcxBuffer *response);
+CURLcode do_delete_request(DavSession *sn, char *lock, CxBuffer *response);
 
 CURLcode do_mkcol_request(DavSession *sn, char *lock);
 
@@ -117,14 +117,14 @@
 
 CURLcode do_copy_move_request(DavSession *sn, char *dest, char *lock, DavBool copy, DavBool override);
 
-UcxBuffer* create_lock_request(void);
-int parse_lock_response(DavSession *sn, UcxBuffer *response, LockDiscovery *lock);
-CURLcode do_lock_request(DavSession *sn, UcxBuffer *request, UcxBuffer *response, time_t timeout);
+CxBuffer* create_lock_request(void);
+int parse_lock_response(DavSession *sn, CxBuffer *response, LockDiscovery *lock);
+CURLcode do_lock_request(DavSession *sn, CxBuffer *request, CxBuffer *response, time_t timeout);
 CURLcode do_unlock_request(DavSession *sn, char *locktoken);
 
 CURLcode do_simple_request(DavSession *sn, char *method, char *locktoken);
 
-CURLcode do_report_request(DavSession *sn, UcxBuffer *request, UcxBuffer *response);
+CURLcode do_report_request(DavSession *sn, CxBuffer *request, CxBuffer *response);
 
 #ifdef	__cplusplus
 }