dovecot-2.0: Compiler warning fix.

dovecot at dovecot.org dovecot at dovecot.org
Tue Mar 2 17:21:19 EET 2010


details:   http://hg.dovecot.org/dovecot-2.0/rev/60bc95bc10f2
changeset: 10829:60bc95bc10f2
user:      Timo Sirainen <tss at iki.fi>
date:      Tue Mar 02 17:21:16 2010 +0200
description:
Compiler warning fix.

diffstat:

 src/anvil/penalty.c |  19 ++++++++-----------
 1 files changed, 8 insertions(+), 11 deletions(-)

diffs (39 lines):

diff -r 154f52b7a6fd -r 60bc95bc10f2 src/anvil/penalty.c
--- a/src/anvil/penalty.c	Tue Mar 02 16:12:44 2010 +0200
+++ b/src/anvil/penalty.c	Tue Mar 02 17:21:16 2010 +0200
@@ -160,27 +160,24 @@
 static void penalty_timeout(struct penalty *penalty)
 {
 	struct penalty_rec *rec;
-	time_t expire_time;
+	time_t rec_last_update, expire_time;
+	unsigned int diff;
 
 	expire_time = ioloop_time - penalty->expire_secs;
 	while (penalty->oldest != NULL) {
 		rec = penalty->oldest;
 
-		if (rec->last_penalty + (time_t)rec->last_update > expire_time)
+		rec_last_update = rec->last_penalty + rec->last_update;
+		if (rec_last_update > expire_time) {
+			diff = rec_last_update - expire_time;
+			penalty->to = timeout_add(diff * 1000,
+						  penalty_timeout, penalty);
 			break;
+		}
 		hash_table_remove(penalty->hash, rec->ident);
 		penalty_rec_free(penalty, rec);
 	}
-
 	timeout_remove(&penalty->to);
-	rec = penalty->oldest;
-	if (rec != NULL) {
-		unsigned int diff;
-
-		diff = rec->last_penalty + rec->last_update - expire_time;
-		penalty->to = timeout_add(diff * 1000,
-					  penalty_timeout, penalty);
-	}
 }
 
 void penalty_inc(struct penalty *penalty, const char *ident,


More information about the dovecot-cvs mailing list