From cb8a50124161e148784b651970cc6dcc293ffd00 Mon Sep 17 00:00:00 2001 From: Benjamin Legrand Date: Fri, 19 Oct 2012 14:23:20 +0200 Subject: [PATCH] Fix a typeo and rename REPLCIA to REPLICA. BUG #8 Signed-off-by: Andreas Schneider --- src/csync.c | 8 ++++---- src/csync_private.h | 2 +- src/csync_propagate.c | 18 +++++++++--------- src/csync_reconcile.c | 4 ++-- src/csync_update.c | 6 +++--- src/csync_util.c | 4 ++-- src/vio/csync_vio.c | 34 +++++++++++++++++----------------- 7 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/csync.c b/src/csync.c index 2bbf8b2468..4ae2c79e8f 100644 --- a/src/csync.c +++ b/src/csync.c @@ -289,7 +289,7 @@ retry_vio_init: goto out; } SAFE_FREE(module); - ctx->remote.type = REMOTE_REPLCIA; + ctx->remote.type = REMOTE_REPLICA; } } else { ctx->remote.type = LOCAL_REPLICA; @@ -373,7 +373,7 @@ int csync_update(CSYNC *ctx) { /* update detection for remote replica */ if( ! ctx->options.local_only_mode ) { csync_gettime(&start); - ctx->current = REMOTE_REPLCIA; + ctx->current = REMOTE_REPLICA; ctx->replica = ctx->remote.type; rc = csync_ftw(ctx, ctx->remote.uri, csync_walker, MAX_DEPTH); @@ -425,7 +425,7 @@ int csync_reconcile(CSYNC *ctx) { /* Reconciliation for local replica */ csync_gettime(&start); - ctx->current = REMOTE_REPLCIA; + ctx->current = REMOTE_REPLICA; ctx->replica = ctx->remote.type; rc = csync_reconcile_updates(ctx); @@ -475,7 +475,7 @@ int csync_propagate(CSYNC *ctx) { /* Reconciliation for local replica */ csync_gettime(&start); - ctx->current = REMOTE_REPLCIA; + ctx->current = REMOTE_REPLICA; ctx->replica = ctx->remote.type; rc = csync_propagate_files(ctx); diff --git a/src/csync_private.h b/src/csync_private.h index 2380aa7aab..9c7112bc8e 100644 --- a/src/csync_private.h +++ b/src/csync_private.h @@ -72,7 +72,7 @@ enum csync_replica_e { LOCAL_REPLICA, - REMOTE_REPLCIA + REMOTE_REPLICA }; /** diff --git a/src/csync_propagate.c b/src/csync_propagate.c index 6df35331a0..8fb27d3626 100644 --- a/src/csync_propagate.c +++ b/src/csync_propagate.c @@ -86,7 +86,7 @@ static int _csync_push_file(CSYNC *ctx, csync_file_stat_t *st) { goto out; } break; - case REMOTE_REPLCIA: + case REMOTE_REPLICA: srep = ctx->remote.type; drep = ctx->local.type; if (asprintf(&suri, "%s/%s", ctx->remote.uri, st->path) < 0) { @@ -439,7 +439,7 @@ static int _csync_backup_file(CSYNC *ctx, csync_file_stat_t *st) { goto out; } break; - case REMOTE_REPLCIA: + case REMOTE_REPLICA: drep = ctx->local.type; if (asprintf(&suri, "%s/%s", ctx->local.uri, st->path) < 0) { rc = -1; @@ -548,7 +548,7 @@ static int _csync_remove_file(CSYNC *ctx, csync_file_stat_t *st) { return -1; } break; - case REMOTE_REPLCIA: + case REMOTE_REPLICA: if (asprintf(&uri, "%s/%s", ctx->remote.uri, st->path) < 0) { return -1; } @@ -609,7 +609,7 @@ static int _csync_new_dir(CSYNC *ctx, csync_file_stat_t *st) { return -1; } break; - case REMOTE_REPLCIA: + case REMOTE_REPLICA: dest = ctx->local.type; if (asprintf(&uri, "%s/%s", ctx->local.uri, st->path) < 0) { return -1; @@ -702,7 +702,7 @@ static int _csync_sync_dir(CSYNC *ctx, csync_file_stat_t *st) { return -1; } break; - case REMOTE_REPLCIA: + case REMOTE_REPLICA: dest = ctx->local.type; if (asprintf(&uri, "%s/%s", ctx->local.uri, st->path) < 0) { return -1; @@ -774,7 +774,7 @@ static int _csync_remove_dir(CSYNC *ctx, csync_file_stat_t *st) { return -1; } break; - case REMOTE_REPLCIA: + case REMOTE_REPLICA: if (asprintf(&uri, "%s/%s", ctx->remote.uri, st->path) < 0) { return -1; } @@ -802,7 +802,7 @@ static int _csync_remove_dir(CSYNC *ctx, csync_file_stat_t *st) { } ctx->local.list = list; break; - case REMOTE_REPLCIA: + case REMOTE_REPLICA: list = c_list_prepend(ctx->remote.list, (void *) st); if (list == NULL) { return -1; @@ -854,7 +854,7 @@ static int _csync_propagation_cleanup(CSYNC *ctx) { list = ctx->local.list; uri = ctx->local.uri; break; - case REMOTE_REPLCIA: + case REMOTE_REPLICA: list = ctx->remote.list; uri = ctx->remote.uri; break; @@ -1004,7 +1004,7 @@ int csync_propagate_files(CSYNC *ctx) { case LOCAL_REPLICA: tree = ctx->local.tree; break; - case REMOTE_REPLCIA: + case REMOTE_REPLICA: tree = ctx->remote.tree; break; default: diff --git a/src/csync_reconcile.c b/src/csync_reconcile.c index a36b351ef5..11c93468b4 100644 --- a/src/csync_reconcile.c +++ b/src/csync_reconcile.c @@ -55,7 +55,7 @@ static int _csync_merge_algorithm_visitor(void *obj, void *data) { case LOCAL_REPLICA: tree = ctx->remote.tree; break; - case REMOTE_REPLCIA: + case REMOTE_REPLICA: tree = ctx->local.tree; break; default: @@ -286,7 +286,7 @@ int csync_reconcile_updates(CSYNC *ctx) { case LOCAL_REPLICA: tree = ctx->local.tree; break; - case REMOTE_REPLCIA: + case REMOTE_REPLICA: tree = ctx->remote.tree; break; default: diff --git a/src/csync_update.c b/src/csync_update.c index 22190d875f..81b722fbb4 100644 --- a/src/csync_update.c +++ b/src/csync_update.c @@ -64,7 +64,7 @@ static int _csync_detect_update(CSYNC *ctx, const char *file, } path += strlen(ctx->local.uri) + 1; break; - case REMOTE_REPLCIA: + case REMOTE_REPLICA: if (strlen(path) <= strlen(ctx->remote.uri)) { return -1; } @@ -149,7 +149,7 @@ out: return -1; } break; - case REMOTE_REPLCIA: + case REMOTE_REPLICA: if (c_rbtree_insert(ctx->remote.tree, (void *) st) < 0) { SAFE_FREE(st); return -1; @@ -256,7 +256,7 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn, case LOCAL_REPLICA: path = filename + strlen(ctx->local.uri) + 1; break; - case REMOTE_REPLCIA: + case REMOTE_REPLICA: path = filename + strlen(ctx->remote.uri) + 1; break; default: diff --git a/src/csync_util.c b/src/csync_util.c index 96e94372c3..55bd71e03c 100644 --- a/src/csync_util.c +++ b/src/csync_util.c @@ -128,7 +128,7 @@ static int _merge_file_trees_visitor(void *obj, void *data) { case LOCAL_REPLICA: tree = ctx->local.tree; break; - case REMOTE_REPLCIA: + case REMOTE_REPLICA: tree = ctx->remote.tree; break; default: @@ -182,7 +182,7 @@ static int _merge_file_trees_visitor(void *obj, void *data) { goto out; } break; - case REMOTE_REPLCIA: + case REMOTE_REPLICA: if (asprintf(&uri, "%s/%s", ctx->remote.uri, fs->path) < 0) { rc = -1; strerror_r(errno, errbuf, sizeof(errbuf)); diff --git a/src/vio/csync_vio.c b/src/vio/csync_vio.c index b50e6ce884..3092277421 100644 --- a/src/vio/csync_vio.c +++ b/src/vio/csync_vio.c @@ -147,7 +147,7 @@ csync_vio_handle_t *csync_vio_open(CSYNC *ctx, const char *uri, int flags, mode_ csync_vio_method_handle_t *mh = NULL; switch(ctx->replica) { - case REMOTE_REPLCIA: + case REMOTE_REPLICA: mh = ctx->module.method->open(uri, flags, mode); break; case LOCAL_REPLICA: @@ -170,7 +170,7 @@ csync_vio_handle_t *csync_vio_creat(CSYNC *ctx, const char *uri, mode_t mode) { csync_vio_method_handle_t *mh = NULL; switch(ctx->replica) { - case REMOTE_REPLCIA: + case REMOTE_REPLICA: mh = ctx->module.method->creat(uri, mode); break; case LOCAL_REPLICA: @@ -197,7 +197,7 @@ int csync_vio_close(CSYNC *ctx, csync_vio_handle_t *fhandle) { } switch(ctx->replica) { - case REMOTE_REPLCIA: + case REMOTE_REPLICA: rc = ctx->module.method->close(fhandle->method_handle); break; case LOCAL_REPLICA: @@ -223,7 +223,7 @@ ssize_t csync_vio_read(CSYNC *ctx, csync_vio_handle_t *fhandle, void *buf, size_ } switch(ctx->replica) { - case REMOTE_REPLCIA: + case REMOTE_REPLICA: rs = ctx->module.method->read(fhandle->method_handle, buf, count); break; case LOCAL_REPLICA: @@ -245,7 +245,7 @@ ssize_t csync_vio_write(CSYNC *ctx, csync_vio_handle_t *fhandle, const void *buf } switch(ctx->replica) { - case REMOTE_REPLCIA: + case REMOTE_REPLICA: rs = ctx->module.method->write(fhandle->method_handle, buf, count); break; case LOCAL_REPLICA: @@ -262,7 +262,7 @@ off_t csync_vio_lseek(CSYNC *ctx, csync_vio_handle_t *fhandle, off_t offset, int off_t ro = 0; switch(ctx->replica) { - case REMOTE_REPLCIA: + case REMOTE_REPLICA: ro = ctx->module.method->lseek(fhandle->method_handle, offset, whence); break; case LOCAL_REPLICA: @@ -280,7 +280,7 @@ csync_vio_handle_t *csync_vio_opendir(CSYNC *ctx, const char *name) { csync_vio_method_handle_t *mh = NULL; switch(ctx->replica) { - case REMOTE_REPLCIA: + case REMOTE_REPLICA: mh = ctx->module.method->opendir(name); break; case LOCAL_REPLICA: @@ -307,7 +307,7 @@ int csync_vio_closedir(CSYNC *ctx, csync_vio_handle_t *dhandle) { } switch(ctx->replica) { - case REMOTE_REPLCIA: + case REMOTE_REPLICA: rc = ctx->module.method->closedir(dhandle->method_handle); break; case LOCAL_REPLICA: @@ -327,7 +327,7 @@ csync_vio_file_stat_t *csync_vio_readdir(CSYNC *ctx, csync_vio_handle_t *dhandle csync_vio_file_stat_t *fs = NULL; switch(ctx->replica) { - case REMOTE_REPLCIA: + case REMOTE_REPLICA: fs = ctx->module.method->readdir(dhandle->method_handle); break; case LOCAL_REPLICA: @@ -344,7 +344,7 @@ int csync_vio_mkdir(CSYNC *ctx, const char *uri, mode_t mode) { int rc = -1; switch(ctx->replica) { - case REMOTE_REPLCIA: + case REMOTE_REPLICA: rc = ctx->module.method->mkdir(uri, mode); break; case LOCAL_REPLICA: @@ -423,7 +423,7 @@ int csync_vio_rmdir(CSYNC *ctx, const char *uri) { int rc = -1; switch(ctx->replica) { - case REMOTE_REPLCIA: + case REMOTE_REPLICA: rc = ctx->module.method->rmdir(uri); break; case LOCAL_REPLICA: @@ -440,7 +440,7 @@ int csync_vio_stat(CSYNC *ctx, const char *uri, csync_vio_file_stat_t *buf) { int rc = -1; switch(ctx->replica) { - case REMOTE_REPLCIA: + case REMOTE_REPLICA: rc = ctx->module.method->stat(uri, buf); break; case LOCAL_REPLICA: @@ -457,7 +457,7 @@ int csync_vio_rename(CSYNC *ctx, const char *olduri, const char *newuri) { int rc = -1; switch(ctx->replica) { - case REMOTE_REPLCIA: + case REMOTE_REPLICA: rc = ctx->module.method->rename(olduri, newuri); break; case LOCAL_REPLICA: @@ -474,7 +474,7 @@ int csync_vio_unlink(CSYNC *ctx, const char *uri) { int rc = -1; switch(ctx->replica) { - case REMOTE_REPLCIA: + case REMOTE_REPLICA: rc = ctx->module.method->unlink(uri); break; case LOCAL_REPLICA: @@ -491,7 +491,7 @@ int csync_vio_chmod(CSYNC *ctx, const char *uri, mode_t mode) { int rc = -1; switch(ctx->replica) { - case REMOTE_REPLCIA: + case REMOTE_REPLICA: rc = ctx->module.method->chmod(uri, mode); break; case LOCAL_REPLICA: @@ -508,7 +508,7 @@ int csync_vio_chown(CSYNC *ctx, const char *uri, uid_t owner, gid_t group) { int rc = -1; switch(ctx->replica) { - case REMOTE_REPLCIA: + case REMOTE_REPLICA: rc = ctx->module.method->chown(uri, owner, group); break; case LOCAL_REPLICA: @@ -525,7 +525,7 @@ int csync_vio_utimes(CSYNC *ctx, const char *uri, const struct timeval *times) { int rc = -1; switch(ctx->replica) { - case REMOTE_REPLCIA: + case REMOTE_REPLICA: rc = ctx->module.method->utimes(uri, times); break; case LOCAL_REPLICA: