From 080740f867be2effdaeffceb5a2ce4dc53d97b8f Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 20 May 2013 18:53:22 +0200 Subject: [PATCH] rewrite condition for readability and consistency --- src/sync.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/sync.c b/src/sync.c index 20b5c66..8b7ea57 100644 --- a/src/sync.c +++ b/src/sync.c @@ -1297,11 +1297,14 @@ box_loaded( int sts, void *aux ) * expired message are not counted. */ todel = svars->ctx[S]->count + svars->new_total[S] - svars->chan->max_messages; debug( "scheduling %d excess messages for expiration\n", todel ); - for (tmsg = svars->ctx[S]->msgs; tmsg && todel > 0; tmsg = tmsg->next) - if (!(tmsg->status & M_DEAD) && (srec = tmsg->srec) && + for (tmsg = svars->ctx[S]->msgs; tmsg && todel > 0; tmsg = tmsg->next) { + if (tmsg->status & M_DEAD) + continue; + if ((srec = tmsg->srec) && ((tmsg->flags | srec->aflags[S]) & ~srec->dflags[S] & F_DELETED) && !(srec->status & (S_EXPIRE|S_EXPIRED))) todel--; + } debug( "%d non-deleted excess messages\n", todel ); for (tmsg = svars->ctx[S]->msgs; tmsg; tmsg = tmsg->next) { if (tmsg->status & M_DEAD)