From: Timo Sirainen <tss@iki.fi>
Date: Tue, 7 Sep 2010 16:19:40 +0000 (+0100)
Subject: Compiler warning fixes.
X-Git-Tag: 2.0.2~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e5de04b9d8818d1301c430469f736fcadc2572f0;p=thirdparty%2Fdovecot%2Fcore.git

Compiler warning fixes.
---

diff --git a/src/lib-master/master-auth.c b/src/lib-master/master-auth.c
index 5090354ed5..ff60ba893c 100644
--- a/src/lib-master/master-auth.c
+++ b/src/lib-master/master-auth.c
@@ -128,7 +128,7 @@ static void master_auth_connection_input(struct master_auth_connection *conn)
 		return;
 
 	/* reply is now read */
-	reply = (struct master_auth_reply *)conn->buf;
+	reply = (const void *)conn->buf;
 	conn->buf_pos = 0;
 
 	if (conn->tag != reply->tag)
diff --git a/src/lib-storage/index/index-mail.c b/src/lib-storage/index/index-mail.c
index 0caaa42389..01c39cde23 100644
--- a/src/lib-storage/index/index-mail.c
+++ b/src/lib-storage/index/index-mail.c
@@ -1501,7 +1501,7 @@ void index_mail_set_cache_corrupted(struct mail *mail,
 	struct index_mail *imail = (struct index_mail *)mail;
 	const char *field_name;
 
-	switch (field) {
+	switch ((int)field) {
 	case 0:
 		field_name = "fields";
 		break;
diff --git a/src/lib/fdpass.c b/src/lib/fdpass.c
index d10aa4d3c1..c237bb4edb 100644
--- a/src/lib/fdpass.c
+++ b/src/lib/fdpass.c
@@ -107,6 +107,7 @@ ssize_t fd_send(int handle, int send_fd, const void *data, size_t size)
         struct const_iovec iov;
         struct cmsghdr *cmsg;
 	char buf[CMSG_SPACE(sizeof(int))];
+	void *cmsg_data;
 
 	/* at least one byte is required to be sent with fd passing */
 	i_assert(size > 0 && size < INT_MAX);
@@ -129,7 +130,8 @@ ssize_t fd_send(int handle, int send_fd, const void *data, size_t size)
 		cmsg->cmsg_level = SOL_SOCKET;
 		cmsg->cmsg_type = SCM_RIGHTS;
 		cmsg->cmsg_len = CMSG_LEN(sizeof(int));
-		*((int *) CMSG_DATA(cmsg)) = send_fd;
+		cmsg_data = CMSG_DATA(cmsg);
+		*(int *)cmsg_data = send_fd;
 
 		/* set the real length we want to use. Do it after all is
 		   set just in case CMSG macros required the extra padding
@@ -164,6 +166,7 @@ ssize_t fd_read(int handle, void *data, size_t size, int *fd)
 	struct cmsghdr *cmsg;
 	ssize_t ret;
 	char buf[CMSG_SPACE(sizeof(int))];
+	void *cmsg_data;
 
 	i_assert(size > 0 && size < INT_MAX);
 
@@ -193,8 +196,10 @@ ssize_t fd_read(int handle, void *data, size_t size, int *fd)
 	cmsg = CMSG_FIRSTHDR(&msg);
 	if (!CHECK_MSG(msg) || !CHECK_CMSG(cmsg))
 		*fd = -1;
-	else
-		*fd = *((int *) CMSG_DATA(cmsg));
+	else {
+		cmsg_data = CMSG_DATA(cmsg);
+		*fd = *(int *)cmsg_data;
+	}
 	return ret;
 }
 
diff --git a/src/login-common/ssl-proxy-openssl.c b/src/login-common/ssl-proxy-openssl.c
index 45313e9588..7f71dcc52b 100644
--- a/src/login-common/ssl-proxy-openssl.c
+++ b/src/login-common/ssl-proxy-openssl.c
@@ -706,7 +706,7 @@ const char *ssl_proxy_get_last_error(const struct ssl_proxy *proxy)
 
 const char *ssl_proxy_get_security_string(struct ssl_proxy *proxy)
 {
-	SSL_CIPHER *cipher;
+	const SSL_CIPHER *cipher;
 	int bits, alg_bits;
 	const char *comp_str;