changeset 11334:d6d59ff58511 HEAD

Compiler warning fixes.
author Timo Sirainen <tss@iki.fi>
date Wed, 19 May 2010 17:07:46 +0200
parents 16fbdcbb6dcb
children 1c1db8a6cfc7
files src/director/director-connection.c src/director/user-directory.c src/login-common/login-proxy-state.c
diffstat 3 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/director/director-connection.c	Wed May 19 16:19:56 2010 +0200
+++ b/src/director/director-connection.c	Wed May 19 17:07:46 2010 +0200
@@ -162,7 +162,7 @@
 					     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;
 	}
--- a/src/director/user-directory.c	Wed May 19 16:19:56 2010 +0200
+++ b/src/director/user-directory.c	Wed May 19 17:07:46 2010 +0200
@@ -52,7 +52,7 @@
 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 @@
 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)
--- a/src/login-common/login-proxy-state.c	Wed May 19 16:19:56 2010 +0200
+++ b/src/login-common/login-proxy-state.c	Wed May 19 17:07:46 2010 +0200
@@ -118,7 +118,7 @@
 		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 {