"reformat" S_EXP_S setting logic for understandability.

This commit is contained in:
Oswald Buddenhagen 2005-12-28 19:10:12 +00:00
parent 808001c0a9
commit 61dfbea617

View File

@ -495,11 +495,15 @@ sync_boxes( store_t *ctx[], const char *names[], channel_conf_t *chan )
if (srec->status & S_DEAD) if (srec->status & S_DEAD)
continue; continue;
if (srec->status & S_EXPIRED) { if (srec->status & S_EXPIRED) {
if (!srec->uid[S] || ((ctx[S]->opts & OPEN_OLD) && !findmsg( ctx[S], srec->uid[S], &nsmsg, "slave" ))) if (!srec->uid[S] || ((ctx[S]->opts & OPEN_OLD) && !findmsg( ctx[S], srec->uid[S], &nsmsg, "slave" ))) {
srec->status |= S_EXP_S; srec->status |= S_EXP_S;
else if (minwuid > srec->uid[M]) continue;
minwuid = srec->uid[M]; }
} else if (smaxxuid < srec->uid[S] && minwuid > srec->uid[M]) } else {
if (smaxxuid >= srec->uid[S])
continue;
}
if (minwuid > srec->uid[M])
minwuid = srec->uid[M]; minwuid = srec->uid[M];
} }
debug( " min non-orphaned master uid is %d\n", minwuid ); debug( " min non-orphaned master uid is %d\n", minwuid );