isync

commit 9740e7e8524e74544471a927d56138f14f45a4db
parent d5a1f5876d31975754a41503f30f75cb0594c011
Author: Oswald Buddenhagen <ossi@users.sf.net>
Date:   Mon, 26 Dec 2005 14:55:19 +0000

message tweaks

Diffstat:
M
src/sync.c
 | 
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/sync.c b/src/sync.c
@@ -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))