From: Timo Sirainen <tss@iki.fi>
Date: Wed, 19 May 2010 15:07:46 +0000 (+0200)
Subject: Compiler warning fixes.
X-Git-Tag: 2.0.beta6~196
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dc1bc1685e4a0d58ae7bacaecc282d0ebde2d7da;p=thirdparty%2Fdovecot%2Fcore.git

Compiler warning fixes.

--HG--
branch : HEAD
---

diff --git a/src/director/director-connection.c b/src/director/director-connection.c
index 088747ca90..68172ed605 100644
--- a/src/director/director-connection.c
+++ b/src/director/director-connection.c
@@ -162,7 +162,7 @@ director_user_refresh(struct director *dir, unsigned int username_hash,
 					     host, timestamp);
 		return TRUE;
 	}
-	if (timestamp == ioloop_time && user->timestamp != timestamp) {
+	if (timestamp == ioloop_time && (time_t)user->timestamp != timestamp) {
 		user_directory_refresh(dir->users, user);
 		ret = TRUE;
 	}
diff --git a/src/director/user-directory.c b/src/director/user-directory.c
index 7b4c39db3a..f97d21d932 100644
--- a/src/director/user-directory.c
+++ b/src/director/user-directory.c
@@ -52,7 +52,7 @@ static void user_free(struct user_directory *dir, struct user *user)
 static void user_directory_drop_expired(struct user_directory *dir)
 {
 	while (dir->head != NULL &&
-	       ioloop_time > dir->head->timestamp + dir->timeout_secs)
+	       ioloop_time > (time_t)(dir->head->timestamp + dir->timeout_secs))
 		user_free(dir, dir->head);
 }
 
@@ -117,8 +117,9 @@ unsigned int user_directory_get_username_hash(const char *username)
 bool user_directory_user_has_connections(struct user_directory *dir,
 					 struct user *user)
 {
-	return user->timestamp +
-		dir->timeout_secs - MAX_CLOCK_DRIFT_SECS >= ioloop_time;
+	time_t expire_timestamp = user->timestamp + dir->timeout_secs;
+
+	return expire_timestamp - MAX_CLOCK_DRIFT_SECS >= ioloop_time;
 }
 
 struct user_directory *user_directory_init(unsigned int timeout_secs)
diff --git a/src/login-common/login-proxy-state.c b/src/login-common/login-proxy-state.c
index cdf26a637d..d9886cc46b 100644
--- a/src/login-common/login-proxy-state.c
+++ b/src/login-common/login-proxy-state.c
@@ -118,7 +118,7 @@ void login_proxy_state_notify(struct login_proxy_state *state,
 		ret = write(state->notify_fd, cmd, len);
 	} T_END;
 
-	if (ret != len) {
+	if (ret != (ssize_t)len) {
 		if (ret < 0)
 			i_error("write(%s) failed: %m", state->notify_path);
 		else {