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

rewrite condition for readability and consistency

Browse Source
This commit is contained in:
Oswald Buddenhagen 2013-05-20 18:53:22 +02:00
parent b10fd0c21c
commit 080740f867
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/sync.c
View File

@ -1297,11 +1297,14 @@ box_loaded( int sts, void *aux )
* expired message are not counted. */ * expired message are not counted. */
todel = svars->ctx[S]->count + svars->new_total[S] - svars->chan->max_messages; todel = svars->ctx[S]->count + svars->new_total[S] - svars->chan->max_messages;
debug( "scheduling %d excess messages for expiration\n", todel ); debug( "scheduling %d excess messages for expiration\n", todel );
for (tmsg = svars->ctx[S]->msgs; tmsg && todel > 0; tmsg = tmsg->next) for (tmsg = svars->ctx[S]->msgs; tmsg && todel > 0; tmsg = tmsg->next) {
if (!(tmsg->status & M_DEAD) && (srec = tmsg->srec) && if (tmsg->status & M_DEAD)
continue;
if ((srec = tmsg->srec) &&
((tmsg->flags | srec->aflags[S]) & ~srec->dflags[S] & F_DELETED) && ((tmsg->flags | srec->aflags[S]) & ~srec->dflags[S] & F_DELETED) &&
!(srec->status & (S_EXPIRE|S_EXPIRED))) !(srec->status & (S_EXPIRE|S_EXPIRED)))
todel--; todel--;
}
debug( "%d non-deleted excess messages\n", todel ); debug( "%d non-deleted excess messages\n", todel );
for (tmsg = svars->ctx[S]->msgs; tmsg; tmsg = tmsg->next) { for (tmsg = svars->ctx[S]->msgs; tmsg; tmsg = tmsg->next) {
if (tmsg->status & M_DEAD) if (tmsg->status & M_DEAD)