From: Timo Sirainen <tss@iki.fi>
Date: Wed, 7 Aug 2013 14:20:10 +0000 (+0300)
Subject: Compiler warning fixes.
X-Git-Tag: 2.2.6~146
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=61b0eeb704039e9837ef3dc7d133096851517d0f;p=thirdparty%2Fdovecot%2Fcore.git

Compiler warning fixes.
---

diff --git a/src/director/director-connection.c b/src/director/director-connection.c
index 0f396d00c3..d69e82cfa0 100644
--- a/src/director/director-connection.c
+++ b/src/director/director-connection.c
@@ -1175,7 +1175,7 @@ static bool director_connection_sync(struct director_connection *conn,
 	}
 
 	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 --git a/src/lib-ssl-iostream/iostream-openssl-context.c b/src/lib-ssl-iostream/iostream-openssl-context.c
index 81133305b4..512ee98763 100644
--- a/src/lib-ssl-iostream/iostream-openssl-context.c
+++ b/src/lib-ssl-iostream/iostream-openssl-context.c
@@ -433,8 +433,8 @@ ssl_proxy_ctx_get_pkey_ec_curve_name(const struct ssl_iostream_settings *set,
 
 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 --git a/src/login-common/ssl-proxy-openssl.c b/src/login-common/ssl-proxy-openssl.c
index 07ef78d8c5..7939b918f3 100644
--- a/src/login-common/ssl-proxy-openssl.c
+++ b/src/login-common/ssl-proxy-openssl.c
@@ -121,7 +121,9 @@ static void ssl_server_context_deinit(struct ssl_server_context **_ctx);
 
 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 @@ ssl_proxy_ctx_init(SSL_CTX *ssl_ctx, const struct master_service_ssl_settings *s
 
 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;