mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-27 15:05:19 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix a typeo and rename REPLCIA to REPLICA.

Browse source 
BUG #8

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Benjamin Legrand 2012-10-19 14:23:20 +02:00 committed by Andreas Schneider
parent 792be0f053
commit cb8a501241
7 changed files with 38 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/csync.c
View file

@ -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);

2
src/csync_private.h
View file

@ -72,7 +72,7 @@
enum csync_replica_e {
LOCAL_REPLICA,
REMOTE_REPLCIA
REMOTE_REPLICA
};
/**

18
src/csync_propagate.c
View file

@ -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:

4
src/csync_reconcile.c
View file

@ -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:

6
src/csync_update.c
View file

@ -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:

4
src/csync_util.c
View file

@ -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));

34
src/vio/csync_vio.c
View file

@ -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: