dovecot-2.2: Compiler warning fixes.

dovecot at dovecot.org dovecot at dovecot.org
Wed Aug 7 17:21:16 EEST 2013


details:   http://hg.dovecot.org/dovecot-2.2/rev/17e43eda8f22
changeset: 16678:17e43eda8f22
user:      Timo Sirainen <tss at iki.fi>
date:      Wed Aug 07 17:20:10 2013 +0300
description:
Compiler warning fixes.

diffstat:

 src/director/director-connection.c              |  2 +-
 src/lib-ssl-iostream/iostream-openssl-context.c |  4 ++--
 src/login-common/ssl-proxy-openssl.c            |  4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diffs (48 lines):

diff -r a07ab0c638d2 -r 17e43eda8f22 src/director/director-connection.c
--- a/src/director/director-connection.c	Wed Aug 07 16:09:29 2013 +0300
+++ b/src/director/director-connection.c	Wed Aug 07 17:20:10 2013 +0300
@@ -1175,7 +1175,7 @@
 	}
 
 	if ((host == NULL || !host->self) &&
-	    dir->self_host->last_sync_timestamp != ioloop_time)
+	    (time_t)dir->self_host->last_sync_timestamp != ioloop_time)
 		(void)director_resend_sync(dir);
 	return TRUE;
 }
diff -r a07ab0c638d2 -r 17e43eda8f22 src/lib-ssl-iostream/iostream-openssl-context.c
--- a/src/lib-ssl-iostream/iostream-openssl-context.c	Wed Aug 07 16:09:29 2013 +0300
+++ b/src/lib-ssl-iostream/iostream-openssl-context.c	Wed Aug 07 17:20:10 2013 +0300
@@ -433,8 +433,8 @@
 
 static int
 ssl_proxy_ctx_set_crypto_params(SSL_CTX *ssl_ctx,
-				const struct ssl_iostream_settings *set,
-				const char **error_r)
+				const struct ssl_iostream_settings *set ATTR_UNUSED,
+				const char **error_r ATTR_UNUSED)
 {
 #if !defined(OPENSSL_NO_ECDH) && OPENSSL_VERSION_NUMBER >= 0x10000000L && OPENSSL_VERSION_NUMBER < 0x10002000L
 	EC_KEY *ecdh;
diff -r a07ab0c638d2 -r 17e43eda8f22 src/login-common/ssl-proxy-openssl.c
--- a/src/login-common/ssl-proxy-openssl.c	Wed Aug 07 16:09:29 2013 +0300
+++ b/src/login-common/ssl-proxy-openssl.c	Wed Aug 07 17:20:10 2013 +0300
@@ -121,7 +121,9 @@
 
 static void ssl_proxy_ctx_set_crypto_params(SSL_CTX *ssl_ctx,
                                             const struct master_service_ssl_settings *set);
+#if !defined(OPENSSL_NO_ECDH) && OPENSSL_VERSION_NUMBER >= 0x10000000L && OPENSSL_VERSION_NUMBER < 0x10002000L
 static int ssl_proxy_ctx_get_pkey_ec_curve_name(const struct master_service_ssl_settings *set);
+#endif
 
 static unsigned int ssl_server_context_hash(const struct ssl_server_context *ctx)
 {
@@ -1013,7 +1015,7 @@
 
 static void
 ssl_proxy_ctx_set_crypto_params(SSL_CTX *ssl_ctx,
-                                const struct master_service_ssl_settings *set)
+	const struct master_service_ssl_settings *set ATTR_UNUSED)
 {
 #if !defined(OPENSSL_NO_ECDH) && OPENSSL_VERSION_NUMBER >= 0x10000000L && OPENSSL_VERSION_NUMBER < 0x10002000L
 	EC_KEY *ecdh;


More information about the dovecot-cvs mailing list