From b6aaa6fd2bcf95e11b4937e582231cc7007f91da Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Tue, 6 Mar 2018 07:04:02 +0100 Subject: [PATCH] CSync: Remove unused error codes None of the removed ERRNO code were ever set. So none of the removed error hapenned anymore --- src/csync/csync.cpp | 2 -- src/csync/csync.h | 21 --------------------- src/csync/csync_macros.h | 11 ----------- src/csync/csync_misc.cpp | 22 ---------------------- src/libsync/discoveryphase.cpp | 2 +- src/libsync/syncengine.cpp | 20 +------------------- 6 files changed, 2 insertions(+), 76 deletions(-) diff --git a/src/csync/csync.cpp b/src/csync/csync.cpp index 614a0693e1..1b38fe0085 100644 --- a/src/csync/csync.cpp +++ b/src/csync/csync.cpp @@ -203,8 +203,6 @@ static int _csync_walk_tree(CSYNC *ctx, csync_s::FileMap &tree, const csync_tree { for (auto &pair : tree) { if (_csync_treewalk_visitor(pair.second.get(), ctx, visitor) < 0) { - if( ctx->status_code == CSYNC_STATUS_OK ) - ctx->status_code = csync_errno_to_status(errno, CSYNC_STATUS_TREE_ERROR); return -1; } } diff --git a/src/csync/csync.h b/src/csync/csync.h index 157346c9a4..aba98ea85a 100644 --- a/src/csync/csync.h +++ b/src/csync/csync.h @@ -65,38 +65,17 @@ enum csync_status_codes_e { CSYNC_STATUS_ERROR = 1024, /* don't use this code, */ CSYNC_STATUS_UNSUCCESSFUL, /* Unspecific problem happend */ - CSYNC_STATUS_NO_LOCK, /* OBSOLETE does not happen anymore */ CSYNC_STATUS_STATEDB_LOAD_ERROR, /* Statedb can not be loaded. */ - CSYNC_STATUS_STATEDB_CORRUPTED, /* Statedb is corrupted */ - CSYNC_STATUS_NO_MODULE, /* URL passed to csync does not start with owncloud:// or ownclouds:// */ - CSYNC_STATUS_TIMESKEW, /* OBSOLETE */ - CSYNC_STATUS_FILESYSTEM_UNKNOWN, /* UNUSED */ - CSYNC_STATUS_TREE_ERROR, /* csync trees could not be created */ CSYNC_STATUS_UPDATE_ERROR, /* general update or discovery error */ - CSYNC_STATUS_PROPAGATE_ERROR, /* OBSOLETE */ - CSYNC_STATUS_REMOTE_ACCESS_ERROR, /* UNUSED */ - CSYNC_STATUS_REMOTE_CREATE_ERROR, /* UNUSED */ - CSYNC_STATUS_REMOTE_STAT_ERROR, /* UNUSED */ - CSYNC_STATUS_LOCAL_CREATE_ERROR, /* UNUSED */ - CSYNC_STATUS_LOCAL_STAT_ERROR, /* UNUSED */ - CSYNC_STATUS_PROXY_ERROR, /* UNUSED */ - CSYNC_STATUS_LOOKUP_ERROR, /* Neon fails to find proxy. Almost OBSOLETE */ - CSYNC_STATUS_SERVER_AUTH_ERROR, /* UNUSED */ - CSYNC_STATUS_PROXY_AUTH_ERROR, /* UNUSED */ - CSYNC_STATUS_CONNECT_ERROR, /* neon driven connection failed */ CSYNC_STATUS_TIMEOUT, /* UNUSED */ CSYNC_STATUS_HTTP_ERROR, /* UNUSED */ CSYNC_STATUS_PERMISSION_DENIED, /* */ CSYNC_STATUS_NOT_FOUND, CSYNC_STATUS_FILE_EXISTS, CSYNC_STATUS_OUT_OF_SPACE, - CSYNC_STATUS_QUOTA_EXCEEDED, /* UNUSED */ CSYNC_STATUS_SERVICE_UNAVAILABLE, CSYNC_STATUS_STORAGE_UNAVAILABLE, CSYNC_STATUS_FILE_SIZE_ERROR, - CSYNC_STATUS_CONTEXT_LOST, - CSYNC_STATUS_MERGE_FILETREE_ERROR, - CSYNC_STATUS_CSYNC_STATUS_ERROR, CSYNC_STATUS_OPENDIR_ERROR, CSYNC_STATUS_READDIR_ERROR, CSYNC_STATUS_OPEN_ERROR, diff --git a/src/csync/csync_macros.h b/src/csync/csync_macros.h index f128b434d5..8bb3ae7070 100644 --- a/src/csync/csync_macros.h +++ b/src/csync/csync_macros.h @@ -32,19 +32,8 @@ * should always be larger than the highest system errno. */ #define CSYNC_CUSTOM_ERRNO_BASE 10000 -#define ERRNO_GENERAL_ERROR CSYNC_CUSTOM_ERRNO_BASE+2 -#define ERRNO_LOOKUP_ERROR CSYNC_CUSTOM_ERRNO_BASE+3 -#define ERRNO_USER_UNKNOWN_ON_SERVER CSYNC_CUSTOM_ERRNO_BASE+4 -#define ERRNO_PROXY_AUTH CSYNC_CUSTOM_ERRNO_BASE+5 -#define ERRNO_CONNECT CSYNC_CUSTOM_ERRNO_BASE+6 -#define ERRNO_TIMEOUT CSYNC_CUSTOM_ERRNO_BASE+7 -#define ERRNO_PRECONDITION CSYNC_CUSTOM_ERRNO_BASE+8 -#define ERRNO_RETRY CSYNC_CUSTOM_ERRNO_BASE+9 -#define ERRNO_REDIRECT CSYNC_CUSTOM_ERRNO_BASE+10 #define ERRNO_WRONG_CONTENT CSYNC_CUSTOM_ERRNO_BASE+11 -#define ERRNO_ERROR_STRING CSYNC_CUSTOM_ERRNO_BASE+13 #define ERRNO_SERVICE_UNAVAILABLE CSYNC_CUSTOM_ERRNO_BASE+14 -#define ERRNO_USER_ABORT CSYNC_CUSTOM_ERRNO_BASE+16 #define ERRNO_STORAGE_UNAVAILABLE CSYNC_CUSTOM_ERRNO_BASE+17 #define ERRNO_FORBIDDEN CSYNC_CUSTOM_ERRNO_BASE+18 diff --git a/src/csync/csync_misc.cpp b/src/csync/csync_misc.cpp index fc35983a57..5bdb4ba29d 100644 --- a/src/csync/csync_misc.cpp +++ b/src/csync/csync_misc.cpp @@ -78,24 +78,6 @@ CSYNC_STATUS csync_errno_to_status(int error, CSYNC_STATUS default_status) status = CSYNC_STATUS_OK; break; /* The custom errnos first. */ - case ERRNO_GENERAL_ERROR: - status = CSYNC_STATUS_UNSUCCESSFUL; - break; - case ERRNO_LOOKUP_ERROR: /* In Neon: Server or proxy hostname lookup failed */ - status = CSYNC_STATUS_LOOKUP_ERROR; - break; - case ERRNO_USER_UNKNOWN_ON_SERVER: /* Neon: User authentication on server failed. */ - status = CSYNC_STATUS_SERVER_AUTH_ERROR; - break; - case ERRNO_PROXY_AUTH: - status = CSYNC_STATUS_PROXY_AUTH_ERROR; /* Neon: User authentication on proxy failed */ - break; - case ERRNO_CONNECT: - status = CSYNC_STATUS_CONNECT_ERROR; /* Network: Connection error */ - break; - case ERRNO_TIMEOUT: - status = CSYNC_STATUS_TIMEOUT; /* Network: Timeout error */ - break; case ERRNO_SERVICE_UNAVAILABLE: status = CSYNC_STATUS_SERVICE_UNAVAILABLE; /* Service temporarily down */ break; @@ -105,9 +87,6 @@ CSYNC_STATUS csync_errno_to_status(int error, CSYNC_STATUS default_status) case EFBIG: status = CSYNC_STATUS_FILE_SIZE_ERROR; /* File larger than 2MB */ break; - case ERRNO_PRECONDITION: - case ERRNO_RETRY: - case ERRNO_REDIRECT: case ERRNO_WRONG_CONTENT: status = CSYNC_STATUS_HTTP_ERROR; break; @@ -160,7 +139,6 @@ CSYNC_STATUS csync_errno_to_status(int error, CSYNC_STATUS default_status) case EMLINK: /* Too many links */ case EPIPE: /* Broken pipe */ - case ERRNO_ERROR_STRING: default: status = default_status; } diff --git a/src/libsync/discoveryphase.cpp b/src/libsync/discoveryphase.cpp index 1eb8489b57..1b9e227d6a 100644 --- a/src/libsync/discoveryphase.cpp +++ b/src/libsync/discoveryphase.cpp @@ -429,7 +429,7 @@ void DiscoverySingleDirectoryJob::lsJobFinishedWithoutErrorSlot() deleteLater(); return; } else if (!_error.isEmpty()) { - emit finishedWithError(ERRNO_ERROR_STRING, _error); + emit finishedWithError(ERRNO_WRONG_CONTENT, _error); deleteLater(); return; } diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp index ba604ef7e7..8a6d17b1ce 100644 --- a/src/libsync/syncengine.cpp +++ b/src/libsync/syncengine.cpp @@ -123,27 +123,9 @@ QString SyncEngine::csyncErrorToString(CSYNC_STATUS err) errStr = tr("CSync failed to load or create the journal file. " "Make sure you have read and write permissions in the local sync folder."); break; - case CSYNC_STATUS_STATEDB_CORRUPTED: - errStr = tr("CSync failed to load the journal file. The journal file is corrupted."); - break; - case CSYNC_STATUS_NO_MODULE: - errStr = tr("

The %1 plugin for csync could not be loaded.
Please verify the installation!

").arg(qApp->applicationName()); - break; case CSYNC_STATUS_UPDATE_ERROR: errStr = tr("CSync processing step update failed."); break; - case CSYNC_STATUS_PROXY_AUTH_ERROR: - errStr = tr("CSync could not authenticate at the proxy."); - break; - case CSYNC_STATUS_LOOKUP_ERROR: - errStr = tr("CSync failed to lookup proxy or server."); - break; - case CSYNC_STATUS_SERVER_AUTH_ERROR: - errStr = tr("CSync failed to authenticate at the %1 server.").arg(qApp->applicationName()); - break; - case CSYNC_STATUS_CONNECT_ERROR: - errStr = tr("CSync failed to connect to the network."); - break; case CSYNC_STATUS_TIMEOUT: errStr = tr("A network connection timeout happened."); break; @@ -754,7 +736,7 @@ void SyncEngine::handleSyncError(CSYNC *ctx, const char *state) if (CSYNC_STATUS_IS_EQUAL(err, CSYNC_STATUS_ABORTED)) { qCInfo(lcEngine) << "Update phase was aborted by user!"; - } else if (CSYNC_STATUS_IS_EQUAL(err, CSYNC_STATUS_SERVICE_UNAVAILABLE) || CSYNC_STATUS_IS_EQUAL(err, CSYNC_STATUS_CONNECT_ERROR)) { + } else if (CSYNC_STATUS_IS_EQUAL(err, CSYNC_STATUS_SERVICE_UNAVAILABLE)) { emit csyncUnavailable(); } else { csyncError(errStr);