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

message tweaks

Browse Source
This commit is contained in:
Oswald Buddenhagen 2005-12-26 14:55:19 +00:00
parent d5a1f5876d
commit 9740e7e852
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/sync.c
View File

@ -263,7 +263,7 @@ sync_old( int tops, store_t *sctx, store_t *tctx, store_conf_t *tconf, FILE *jfp
/* c.4) d.9) / b.4) d.4) */
debug( pull ? " master vanished\n" : " slave vanished\n" );
if (tmsg && tmsg->flags != *nflags)
info( "Info: conflicting changes in (%d,%d)\n", srec->muid, srec->suid );
info( "Info: Conflicting changes in (%d,%d)\n", srec->muid, srec->suid );
if (tops & OP_DELETE) {
debug( pull ? " -> pulling delete\n" : " -> pushing delete\n" );
switch (tdriver->set_flags( tctx, tmsg, tuid, F_DELETED, 0 )) {
@ -865,7 +865,7 @@ sync_boxes( store_t *mctx, const char *mname,
goto finish;
if ((chan->sops & (OP_NEW|OP_RENEW)) && chan->max_messages) {
debug( "expiring excessive entries\n" );
debug( "expiring excess entries\n" );
todel = sctx->count - chan->max_messages;
for (smsg = sctx->msgs; smsg && todel > 0; smsg = smsg->next)
if (!(smsg->status & M_DEAD) && (smsg->flags & F_DELETED))