dovecot-1.1: Compiler warning fixes

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-1.1/rev/899127b7c7e6
changeset: 7384:899127b7c7e6
user:      Timo Sirainen <tss at iki.fi>
date:      Sun Mar 09 01:10:14 2008 +0200
description:
Compiler warning fixes

diffstat:

3 files changed, 14 insertions(+), 8 deletions(-)
src/auth/auth-request-handler.c  |    2 +-
src/plugins/expire/expire-tool.c |    6 ++++--
src/util/listview.c              |   14 +++++++++-----

diffs (72 lines):

diff -r 9d6d555950dd -r 899127b7c7e6 src/auth/auth-request-handler.c
--- a/src/auth/auth-request-handler.c	Sun Mar 09 01:07:08 2008 +0200
+++ b/src/auth/auth-request-handler.c	Sun Mar 09 01:10:14 2008 +0200
@@ -523,7 +523,7 @@ void auth_request_handler_flush_failures
 		auth_request = auth_requests[aqueue_idx(auth_failures, 0)];
 
 		diff = ioloop_time - auth_request->last_access;
-		if (diff < auth_failure_delay && !flush_all)
+		if (diff < (time_t)auth_failure_delay && !flush_all)
 			break;
 
 		aqueue_delete_tail(auth_failures);
diff -r 9d6d555950dd -r 899127b7c7e6 src/plugins/expire/expire-tool.c
--- a/src/plugins/expire/expire-tool.c	Sun Mar 09 01:07:08 2008 +0200
+++ b/src/plugins/expire/expire-tool.c	Sun Mar 09 01:10:14 2008 +0200
@@ -125,14 +125,16 @@ mailbox_delete_old_mails(struct expire_c
 			break;
 		}
 
-		if (save_time + expunge_secs <= now && expunge_secs != 0) {
+		if (save_time + (time_t)expunge_secs <= now &&
+		    expunge_secs != 0) {
 			if (!ctx->testrun)
 				mail_expunge(mail);
 			else {
 				i_info("%s: seq=%u uid=%u: Expunge",
 				       mailbox, mail->seq, mail->uid);
 			}
-		} else if (save_time + altmove_secs <= now && altmove_secs != 0) {
+		} else if (save_time + (time_t)altmove_secs <= now &&
+			   altmove_secs != 0) {
 			/* works only with dbox */
 			flags = mail_get_flags(mail);
 			if ((flags & MAIL_INDEX_MAIL_FLAG_BACKEND) != 0) {
diff -r 9d6d555950dd -r 899127b7c7e6 src/util/listview.c
--- a/src/util/listview.c	Sun Mar 09 01:07:08 2008 +0200
+++ b/src/util/listview.c	Sun Mar 09 01:10:14 2008 +0200
@@ -28,8 +28,10 @@ static void dump_hdr(int fd)
 	int ret;
 
 	ret = read(fd, &hdr, sizeof(hdr));
-	if (ret != sizeof(hdr))
-		i_fatal("file hdr read() %d != %ld\n", ret, sizeof(hdr));
+	if (ret != sizeof(hdr)) {
+		i_fatal("file hdr read() %d != %"PRIuSIZE_T"\n",
+			ret, sizeof(hdr));
+	}
 
 	printf("version = %u.%u\n", hdr.major_version, hdr.minor_version);
 	printf("header size = %u\n", hdr.header_size);
@@ -58,7 +60,7 @@ static void dump_dir(int fd, unsigned in
 	}
 
 	if (ret != sizeof(dir))
-		i_fatal("dir read() %d != %ld", ret, sizeof(dir));
+		i_fatal("dir read() %d != %"PRIuSIZE_T, ret, sizeof(dir));
 
 	dir.next_offset = mail_index_offset_to_uint32(dir.next_offset);
 	printf("%s: DIR: offset=%"PRIuUOFF_T" next_offset=%u count=%u dir_size=%u\n",
@@ -77,8 +79,10 @@ static void dump_dir(int fd, unsigned in
 		if (ret == 0)
 			i_fatal("unexpected EOF, %d/%d records", i, dir.count);
 
-		if (ret != sizeof(rec))
-			i_fatal("rec read() %d != %ld", ret, sizeof(rec));
+		if (ret != sizeof(rec)) {
+			i_fatal("rec read() %d != %"PRIuSIZE_T,
+				ret, sizeof(rec));
+		}
 		rec.dir_offset = mail_index_offset_to_uint32(rec.dir_offset);
 
 		ret = pread(fd, name, sizeof(name)-1, rec.name_offset);