lobo/isync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove superfluous temporary rflags from sync_boxes

Browse Source
This commit is contained in:
Oswald Buddenhagen 2006-01-30 13:01:35 +00:00
parent c7d938f965
commit e205eb62f5
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/sync.c
View File

@ -669,7 +669,7 @@ sync_boxes( store_t *ctx[], const char *names[], channel_conf_t *chan )
for (t = 0; t < 2; t++) { for (t = 0; t < 2; t++) {
int unex; int unex;
unsigned char sflags, aflags, dflags, rflags; unsigned char sflags, aflags, dflags;
/* excludes (push) c.3) d.2) d.3) d.4) / (pull) b.3) d.7) d.8) d.9) */ /* excludes (push) c.3) d.2) d.3) d.4) / (pull) b.3) d.7) d.8) d.9) */
if (!srec->uid[t]) { if (!srec->uid[t]) {
@ -725,13 +725,12 @@ sync_boxes( store_t *ctx[], const char *names[], channel_conf_t *chan )
aflags &= F_DELETED; aflags &= F_DELETED;
dflags = 0; dflags = 0;
} }
rflags = (nflags | aflags) & ~dflags;
switch ((aflags | dflags) ? driver[t]->set_flags( ctx[t], srec->msg[t], srec->uid[t], aflags, dflags ) : DRV_OK) { switch ((aflags | dflags) ? driver[t]->set_flags( ctx[t], srec->msg[t], srec->uid[t], aflags, dflags ) : DRV_OK) {
case DRV_STORE_BAD: ret = SYNC_BAD(t); goto finish; case DRV_STORE_BAD: ret = SYNC_BAD(t); goto finish;
case DRV_BOX_BAD: ret = SYNC_FAIL; goto finish; case DRV_BOX_BAD: ret = SYNC_FAIL; goto finish;
default: /* ok */ break; default: /* ok */ break;
case DRV_OK: case DRV_OK:
nflags = rflags; nflags = (nflags | aflags) & ~dflags;
if (unex) { if (unex) {
debug( "unexpiring pair(%d,%d)\n", srec->uid[M], srec->uid[S] ); debug( "unexpiring pair(%d,%d)\n", srec->uid[M], srec->uid[S] );
/* log last, so deletion can't be misinterpreted! */ /* log last, so deletion can't be misinterpreted! */