From b701bf3d9b7b50ba1e0dbdd79ce2784366ed8edc Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Sat, 6 Apr 2013 18:09:32 +0200 Subject: [PATCH] csync: Rename UNSPEC_ERROR to UNSUCCESSFUL. --- src/csync.h | 6 +++--- src/csync_misc.c | 2 +- src/csync_propagate.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/csync.h b/src/csync.h index 7d0441d12d..a63beb67eb 100644 --- a/src/csync.h +++ b/src/csync.h @@ -76,7 +76,9 @@ extern "C" { enum csync_status_codes_e { CSYNC_STATUS_OK = 0, - CSYNC_STATUS_ERROR = 1000, /* don't use this code, just use in csync_status_ok */ + CSYNC_STATUS_ERROR = 1024, /* don't use this code, + just use in csync_status_ok */ + CSYNC_STATUS_UNSUCCESSFUL, CSYNC_STATUS_NO_LOCK, CSYNC_STATUS_STATEDB_LOAD_ERROR, CSYNC_STATUS_STATEDB_WRITE_ERROR, @@ -114,8 +116,6 @@ enum csync_status_codes_e { CSYNC_STATUS_OPENDIR_ERROR, CSYNC_STATUS_READDIR_ERROR, CSYNC_STATUS_OPEN_ERROR, - - CSYNC_STATUS_UNSPEC_ERROR }; typedef enum csync_status_codes_e CSYNC_STATUS_CODE; diff --git a/src/csync_misc.c b/src/csync_misc.c index 7a7ba11272..632d5108b0 100644 --- a/src/csync_misc.c +++ b/src/csync_misc.c @@ -204,7 +204,7 @@ CSYNC_STATUS_CODE csync_errno_to_csync_status(CSYNC_STATUS_CODE default_err) break; /* The custom errnos first. */ case ERRNO_GENERAL_ERROR: - csync_err = CSYNC_STATUS_UNSPEC_ERROR; + csync_err = CSYNC_STATUS_UNSUCCESSFUL; break; case ERRNO_LOOKUP_ERROR: /* In Neon: Server or proxy hostname lookup failed */ csync_err = CSYNC_STATUS_LOOKUP_ERROR; diff --git a/src/csync_propagate.c b/src/csync_propagate.c index 7258890c9b..fd3b332b12 100644 --- a/src/csync_propagate.c +++ b/src/csync_propagate.c @@ -509,8 +509,8 @@ static int _csync_backup_file(CSYNC *ctx, csync_file_stat_t *st, char **duri) { { CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE,"instruction not allowed: %i %s", st->instruction, csync_instruction_str(st->instruction)); - ctx->status_code = CSYNC_STATUS_UNSPEC_ERROR; - rc = -1; + ctx->status_code = CSYNC_STATUS_UNSUCCESSFUL; + rc = -1; goto out; }