comparison: dav/sync.h
dav/sync.h
- changeset 460
- 22522ff52a62
- parent 444
- 761dc4867208
- child 490
- d94c4fd35c21
equal
deleted
inserted
replaced
| 459:2c112cbaa08e | 460:22522ff52a62 |
|---|---|
| 94 DavSession *sn, | 94 DavSession *sn, |
| 95 SyncDirectory *dir, | 95 SyncDirectory *dir, |
| 96 SyncDatabase *db, | 96 SyncDatabase *db, |
| 97 LocalResource *res); | 97 LocalResource *res); |
| 98 | 98 |
| 99 int resource_pathlen_cmp(LocalResource *res1, LocalResource *res2, void *n); | |
| 100 | |
| 99 int sync_set_status(DavResource *res, char *status); | 101 int sync_set_status(DavResource *res, char *status); |
| 100 int sync_remove_status(DavResource *res); | 102 int sync_remove_status(DavResource *res); |
| 101 UcxBuffer* sync_get_file_tag_data(SyncDirectory *dir, LocalResource *res); | 103 UcxBuffer* sync_get_file_tag_data(SyncDirectory *dir, LocalResource *res); |
| 102 UcxList* sync_get_file_tags(SyncDirectory *dir, LocalResource *res, DavBool *changed); | 104 UcxList* sync_get_file_tags(SyncDirectory *dir, LocalResource *res, DavBool *changed); |
| 103 UcxList* sync_merge_tags(UcxList *tags1, UcxList *tags2); | 105 UcxList* sync_merge_tags(UcxList *tags1, UcxList *tags2); |
| 108 SyncDirectory *dir, | 110 SyncDirectory *dir, |
| 109 DavResource *res, | 111 DavResource *res, |
| 110 LocalResource *local, | 112 LocalResource *local, |
| 111 int *counter); | 113 int *counter); |
| 112 int sync_mkdir(SyncDirectory *dir, DavResource *res, LocalResource *local); | 114 int sync_mkdir(SyncDirectory *dir, DavResource *res, LocalResource *local); |
| 113 int sync_delete_remote_resource(DavSession *sn, LocalResource *res, int *counter); | 115 int sync_delete_remote_resource(DavSession *sn, LocalResource *res, int *counter, UcxList **cols); |
| 114 int sync_update_tags(SyncDirectory *dir, DavSession *sn, DavResource *res, LocalResource *local); | 116 int sync_update_tags(SyncDirectory *dir, DavSession *sn, DavResource *res, LocalResource *local); |
| 115 | 117 |
| 116 void remove_deleted_conflicts(SyncDirectory *dir, SyncDatabase *db); | 118 void remove_deleted_conflicts(SyncDirectory *dir, SyncDatabase *db); |
| 117 | 119 |
| 118 int cmd_resolve_conflicts(CmdArgs *args); | 120 int cmd_resolve_conflicts(CmdArgs *args); |
