mirror of
https://github.com/nextcloud/desktop.git
synced 2024-10-24 21:35:47 +03:00
Use a better name for the status defines.
This commit is contained in:
parent
64a8a911d3
commit
cce81bc154
3 changed files with 15 additions and 15 deletions
16
src/csync.c
16
src/csync.c
|
@ -135,7 +135,7 @@ int csync_init(CSYNC *ctx) {
|
|||
}
|
||||
|
||||
/* Do not initialize twice */
|
||||
if (ctx->status & CSYNC_INIT) {
|
||||
if (ctx->status & CSYNC_STATUS_INIT) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
@ -271,7 +271,7 @@ int csync_init(CSYNC *ctx) {
|
|||
goto out;
|
||||
}
|
||||
|
||||
ctx->status = CSYNC_INIT;
|
||||
ctx->status = CSYNC_STATUS_INIT;
|
||||
|
||||
rc = 0;
|
||||
|
||||
|
@ -330,7 +330,7 @@ int csync_update(CSYNC *ctx) {
|
|||
return -1;
|
||||
}
|
||||
|
||||
ctx->status |= CSYNC_UPDATE;
|
||||
ctx->status |= CSYNC_STATUS_UPDATE;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -380,7 +380,7 @@ int csync_reconcile(CSYNC *ctx) {
|
|||
return -1;
|
||||
}
|
||||
|
||||
ctx->status |= CSYNC_RECONCILE;
|
||||
ctx->status |= CSYNC_STATUS_RECONCILE;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -430,7 +430,7 @@ int csync_propagate(CSYNC *ctx) {
|
|||
return -1;
|
||||
}
|
||||
|
||||
ctx->status |= CSYNC_PROPAGATE;
|
||||
ctx->status |= CSYNC_STATUS_PROPAGATE;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -455,7 +455,7 @@ int csync_destroy(CSYNC *ctx) {
|
|||
csync_vio_shutdown(ctx);
|
||||
|
||||
if (ctx->journal.db != NULL) {
|
||||
if (ctx->status >= CSYNC_DONE) {
|
||||
if (ctx->status >= CSYNC_STATUS_DONE) {
|
||||
clock_gettime(CLOCK_REALTIME, &start);
|
||||
if (csync_journal_write(ctx) == 0) {
|
||||
jwritten = 1;
|
||||
|
@ -577,7 +577,7 @@ int csync_remove_config_dir(CSYNC *ctx) {
|
|||
}
|
||||
|
||||
int csync_remove_journal(CSYNC *ctx) {
|
||||
if ((ctx == NULL) || ! (ctx->status & CSYNC_INIT)) {
|
||||
if ((ctx == NULL) || ! (ctx->status & CSYNC_STATUS_INIT)) {
|
||||
return -1;
|
||||
}
|
||||
unlink(ctx->journal.file);
|
||||
|
@ -590,7 +590,7 @@ int csync_set_module_auth_callback(CSYNC *ctx, csync_module_auth_callback cb) {
|
|||
return -1;
|
||||
}
|
||||
|
||||
if (ctx->status & CSYNC_INIT) {
|
||||
if (ctx->status & CSYNC_STATUS_INIT) {
|
||||
fprintf(stderr, "This function must be called before initialization.");
|
||||
return -1;
|
||||
}
|
||||
|
|
|
@ -58,11 +58,11 @@
|
|||
*/
|
||||
#define MAX_XFER_BUF_SIZE 16348
|
||||
|
||||
#define CSYNC_INIT 1 << 0
|
||||
#define CSYNC_UPDATE 1 << 1
|
||||
#define CSYNC_RECONCILE 1 << 2
|
||||
#define CSYNC_PROPAGATE 1 << 3
|
||||
#define CSYNC_DONE (CSYNC_INIT|CSYNC_UPDATE|CSYNC_RECONCILE|CSYNC_PROPAGATE)
|
||||
#define CSYNC_STATUS_INIT 1 << 0
|
||||
#define CSYNC_STATUS_UPDATE 1 << 1
|
||||
#define CSYNC_STATUS_RECONCILE 1 << 2
|
||||
#define CSYNC_STATUS_PROPAGATE 1 << 3
|
||||
#define CSYNC_STATUS_DONE (CSYNC_STATUS_INIT|CSYNC_STATUS_UPDATE|CSYNC_STATUS_RECONCILE|CSYNC_STATUS_PROPAGATE)
|
||||
|
||||
enum csync_replica_e {
|
||||
LOCAL_REPLICA,
|
||||
|
|
|
@ -34,7 +34,7 @@ START_TEST (check_csync_init)
|
|||
{
|
||||
fail_unless(csync_init(csync) == 0, NULL);
|
||||
|
||||
fail_unless((csync->status & CSYNC_INIT) == 1, NULL);
|
||||
fail_unless((csync->status & CSYNC_STATUS_INIT) == 1, NULL);
|
||||
|
||||
fail_unless(csync_init(csync) == 1, NULL);
|
||||
}
|
||||
|
@ -44,7 +44,7 @@ START_TEST (check_csync_init_module)
|
|||
{
|
||||
fail_unless(csync_init(csync) == 0, NULL);
|
||||
|
||||
fail_unless((csync->status & CSYNC_INIT) == 1, NULL);
|
||||
fail_unless((csync->status & CSYNC_STATUS_INIT) == 1, NULL);
|
||||
|
||||
fail_unless(csync_init(csync) == 1, NULL);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue