dovecot-2.2: Compiler warning fixes.

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/5b05411a81cf
changeset: 14355:5b05411a81cf
user:      Timo Sirainen <tss at iki.fi>
date:      Thu Mar 15 18:24:15 2012 +0200
description:
Compiler warning fixes.

diffstat:

 src/director/user-directory.c                 |  2 +-
 src/lib-index/mail-cache-fields.c             |  2 +-
 src/replication/replicator/replicator-queue.c |  7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diffs (50 lines):

diff -r e935ddb5a9fc -r 5b05411a81cf src/director/user-directory.c
--- a/src/director/user-directory.c	Thu Mar 15 18:24:11 2012 +0200
+++ b/src/director/user-directory.c	Thu Mar 15 18:24:15 2012 +0200
@@ -144,7 +144,7 @@
 bool user_directory_user_is_recently_updated(struct user_directory *dir,
 					     struct user *user)
 {
-	return user->timestamp + dir->timeout_secs/2 >= ioloop_time;
+	return (time_t)(user->timestamp + dir->timeout_secs/2) >= ioloop_time;
 }
 
 bool user_directory_user_is_near_expiring(struct user_directory *dir,
diff -r e935ddb5a9fc -r 5b05411a81cf src/lib-index/mail-cache-fields.c
--- a/src/lib-index/mail-cache-fields.c	Thu Mar 15 18:24:11 2012 +0200
+++ b/src/lib-index/mail-cache-fields.c	Thu Mar 15 18:24:15 2012 +0200
@@ -403,7 +403,7 @@
 		cache->file_field_map[i] = fidx;
 
 		/* update last_used if it's newer than ours */
-		if (last_used[i] > cache->fields[fidx].field.last_used)
+		if ((time_t)last_used[i] > cache->fields[fidx].field.last_used)
 			cache->fields[fidx].field.last_used = last_used[i];
 
 		dec = cache->fields[fidx].field.decision;
diff -r e935ddb5a9fc -r 5b05411a81cf src/replication/replicator/replicator-queue.c
--- a/src/replication/replicator/replicator-queue.c	Thu Mar 15 18:24:11 2012 +0200
+++ b/src/replication/replicator/replicator-queue.c	Thu Mar 15 18:24:15 2012 +0200
@@ -188,6 +188,7 @@
 {
 	struct priorityq_item *item;
 	struct replicator_user *user;
+	time_t next_full_sync;
 
 	item = priorityq_peek(queue->user_queue);
 	if (item == NULL) {
@@ -197,11 +198,11 @@
 	}
 	user = (struct replicator_user *)item;
 
+	next_full_sync = user->last_full_sync + queue->full_sync_interval;
 	if (user->priority == REPLICATION_PRIORITY_NONE &&
-	    user->last_full_sync + queue->full_sync_interval > ioloop_time) {
+	    next_full_sync > ioloop_time) {
 		/* we don't want to do a full sync yet */
-		*next_secs_r = user->last_full_sync +
-			queue->full_sync_interval - ioloop_time;
+		*next_secs_r = next_full_sync - ioloop_time;
 		return NULL;
 	}
 	priorityq_remove(queue->user_queue, &user->item);