comparison: dav/sync.h
dav/sync.h
- branch
- v1.2
- changeset 464
- 37da70159bf6
- parent 400
- 90c6bfa94fa2
equal
deleted
inserted
replaced
| 463:84fbdc541752 | 464:37da70159bf6 |
|---|---|
| 86 DavSession *sn, | 86 DavSession *sn, |
| 87 SyncDirectory *dir, | 87 SyncDirectory *dir, |
| 88 SyncDatabase *db, | 88 SyncDatabase *db, |
| 89 LocalResource *res); | 89 LocalResource *res); |
| 90 | 90 |
| 91 int resource_pathlen_cmp(LocalResource *res1, LocalResource *res2, void *n); | |
| 92 | |
| 91 int sync_set_status(DavResource *res, char *status); | 93 int sync_set_status(DavResource *res, char *status); |
| 92 int sync_remove_status(DavResource *res); | 94 int sync_remove_status(DavResource *res); |
| 93 UcxBuffer* sync_get_file_tag_data(SyncDirectory *dir, LocalResource *res); | 95 UcxBuffer* sync_get_file_tag_data(SyncDirectory *dir, LocalResource *res); |
| 94 UcxList* sync_get_file_tags(SyncDirectory *dir, LocalResource *res, DavBool *changed); | 96 UcxList* sync_get_file_tags(SyncDirectory *dir, LocalResource *res, DavBool *changed); |
| 95 UcxList* sync_merge_tags(UcxList *tags1, UcxList *tags2); | 97 UcxList* sync_merge_tags(UcxList *tags1, UcxList *tags2); |
| 100 SyncDirectory *dir, | 102 SyncDirectory *dir, |
| 101 DavResource *res, | 103 DavResource *res, |
| 102 LocalResource *local, | 104 LocalResource *local, |
| 103 int *counter); | 105 int *counter); |
| 104 int sync_mkdir(SyncDirectory *dir, DavResource *res, LocalResource *local); | 106 int sync_mkdir(SyncDirectory *dir, DavResource *res, LocalResource *local); |
| 105 int sync_delete_remote_resource(DavSession *sn, LocalResource *res, int *counter); | 107 int sync_delete_remote_resource(DavSession *sn, LocalResource *res, int *counter, UcxList **cols); |
| 106 int sync_update_tags(SyncDirectory *dir, DavSession *sn, DavResource *res, LocalResource *local); | 108 int sync_update_tags(SyncDirectory *dir, DavSession *sn, DavResource *res, LocalResource *local); |
| 107 | 109 |
| 108 void remove_deleted_conflicts(SyncDirectory *dir, SyncDatabase *db); | 110 void remove_deleted_conflicts(SyncDirectory *dir, SyncDatabase *db); |
| 109 | 111 |
| 110 int cmd_resolve_conflicts(CmdArgs *args); | 112 int cmd_resolve_conflicts(CmdArgs *args); |
