Mercurial > hg > dav / file diff

--- a/dav/sync.h	Sun Apr 16 14:12:24 2023 +0200
+++ b/dav/sync.h	Fri Apr 21 21:25:32 2023 +0200
@@ -31,7 +31,8 @@
 
 #include <curl/curl.h>
 #include <libidav/webdav.h>
-#include <ucx/list.h>
+#include <cx/list.h>
+#include <cx/hash_map.h>
 
 #include <pthread.h>
 
@@ -98,7 +99,7 @@
 pthread_t start_sighandler(pthread_mutex_t *mutex) ;
 void stop_sighandler(pthread_mutex_t *mutex, pthread_t tid);
 
-void res2map(DavResource *root, UcxMap *map);
+void res2map(DavResource *root, CxMap *map);
 
 int cmd_pull(CmdArgs *args, DavBool incoming);
 int cmd_push(CmdArgs *args, DavBool outgoing, DavBool archive);
@@ -106,14 +107,14 @@
 
 void print_outgoing(
         CmdArgs *args,
-        UcxList *ls_new,
-        UcxList *ls_modified,
-        UcxList *ls_conflict,
-        UcxList *ls_update,
-        UcxList *ls_delete,
-        UcxList *ls_move,
-        UcxList *ls_copy,
-        UcxList *ls_mkcol);
+        CxList *ls_new,
+        CxList *ls_modified,
+        CxList *ls_conflict,
+        CxList *ls_update,
+        CxList *ls_delete,
+        CxList *ls_move,
+        CxList *ls_copy,
+        CxList *ls_mkcol);
 
 RemoteChangeType resource_get_remote_change(
         CmdArgs *a,
@@ -149,15 +150,15 @@
 char* create_tmp_download_path(char *path);
 void move_to_trash(SyncDirectory *dir, char *path);
 
-UcxList* local_scan(SyncDirectory *dir, SyncDatabase *db);
-UcxList* read_changes(SyncDirectory *dir, SyncDatabase *db);
+CxList* local_scan(SyncDirectory *dir, SyncDatabase *db);
+CxList* read_changes(SyncDirectory *dir, SyncDatabase *db);
 LocalResource* local_resource_new(SyncDirectory *dir, SyncDatabase *db, char *path);
 char* local_resource_path(LocalResource *res);
 int local_resource_is_changed(
         SyncDirectory *dir,
         SyncDatabase *db,
         LocalResource *res,
-        UcxMap *svrres,
+        CxMap *svrres,
         DavBool restore_deleted,
         DavBool restore_modified);
 int remote_resource_is_changed(
@@ -183,13 +184,13 @@
 
 int sync_set_status(DavResource *res, char *status);
 int sync_remove_status(DavResource *res);
-UcxBuffer* sync_get_file_tag_data(SyncDirectory *dir, LocalResource *res);
-UcxList* sync_get_file_tags(SyncDirectory *dir, LocalResource *res, DavBool *changed, char **newhash);
-int sync_tags_equal(UcxList *tags1, UcxList *tags2);
+CxBuffer* sync_get_file_tag_data(SyncDirectory *dir, LocalResource *res);
+CxList* sync_get_file_tags(SyncDirectory *dir, LocalResource *res, DavBool *changed, char **newhash);
+int sync_tags_equal(CxList *tags1, CxList *tags2);
 int sync_store_metadata(SyncDirectory *dir, const char *path, LocalResource *local, DavResource *res);
 int sync_store_xattr(SyncDirectory *dir, const char *path, XAttributes *xattr);
 int sync_store_tags(SyncDirectory *dir, const char *path, LocalResource *local, DavResource *res);
-int sync_store_tags_local(SyncDirectory *dir, LocalResource *local, const char *path, UcxList *tags);
+int sync_store_tags_local(SyncDirectory *dir, LocalResource *local, const char *path, CxList *tags);
 int sync_put_resource(
         SyncDirectory *dir,
         DavResource *res,
@@ -203,7 +204,7 @@
         LocalResource *local,
         DavBool copy,
         int *counter);
-int sync_delete_remote_resource(SyncDirectory *dir, DavSession *sn, LocalResource *res, int *counter, UcxList **cols);
+int sync_delete_remote_resource(SyncDirectory *dir, DavSession *sn, LocalResource *res, int *counter, CxList *cols);
 MetadataHashes sync_set_metadata_properties(
         SyncDirectory *dir,
         DavSession *sn,
@@ -216,7 +217,7 @@
         DavResource *res,
         LocalResource *local);
 
-void update_parts(LocalResource *local, UcxList *updates, uint64_t numparts);
+void update_parts(LocalResource *local, CxList *updates, uint64_t numparts);
 
 void remove_deleted_conflicts(SyncDirectory *dir, SyncDatabase *db);