diff --git a/src/csync/csync.h b/src/csync/csync.h index 91cb35cc32d..ec340015b42 100644 --- a/src/csync/csync.h +++ b/src/csync/csync.h @@ -167,29 +167,10 @@ struct OCSYNC_EXPORT csync_file_stat_t int64_t size = 0; uint64_t inode = 0; - OCC::RemotePermissions remotePerm; ItemType type = ItemTypeSkip; - bool child_modified = false; - bool has_ignored_files = false; // Specify that a directory, or child directory contains ignored files. bool is_hidden = false; // Not saved in the DB, only used during discovery for local files. QByteArray path; - QByteArray rename_path; - QByteArray etag; - QByteArray file_id; - QByteArray directDownloadUrl; - QByteArray directDownloadCookies; - QByteArray original_path; // only set if locale conversion fails - - // In the local tree, this can hold a checksum and its type if it is - // computed during discovery for some reason. - // In the remote tree, this will have the server checksum, if available. - // In both cases, the format is "SHA1:baff". - QByteArray checksumHeader; - - CSYNC_STATUS error_status = CSYNC_STATUS_OK; - - SyncInstructions instruction = CSYNC_INSTRUCTION_NONE; }; OCSYNC_EXPORT QDebug operator<<(QDebug debug, const SyncInstructions &job); diff --git a/test/csync/vio_tests/check_vio_ext.cpp b/test/csync/vio_tests/check_vio_ext.cpp index 34d3213f978..087435bdb6e 100644 --- a/test/csync/vio_tests/check_vio_ext.cpp +++ b/test/csync/vio_tests/check_vio_ext.cpp @@ -163,10 +163,6 @@ static void traverse_dir(void **state, const QString &dir, int *cnt) OCC::Vfs *vfs = nullptr; while( (dirent = csync_vio_local_readdir(dh, vfs)) ) { assert_non_null(dirent.get()); - if (!dirent->original_path.isEmpty()) { - sv->ignored_dir = dirent->original_path; - continue; - } assert_false(dirent->path.isEmpty());