From ddf7be769a4527be7eee716164e0be12397c7a3e Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Fri, 27 Jul 2012 18:19:33 +0200 Subject: [PATCH] relay: remove compiler warnings when gnutls is not enabled/found --- src/plugins/relay/relay-client.c | 2 ++ src/plugins/relay/relay-network.c | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/plugins/relay/relay-client.c b/src/plugins/relay/relay-client.c index 5076fa177..5965117b1 100644 --- a/src/plugins/relay/relay-client.c +++ b/src/plugins/relay/relay-client.c @@ -625,7 +625,9 @@ struct t_relay_client * relay_client_new (int sock, const char *address, struct t_relay_server *server) { struct t_relay_client *new_client; +#ifdef HAVE_GNUTLS struct t_config_option *ptr_option; +#endif new_client = malloc (sizeof (*new_client)); if (new_client) diff --git a/src/plugins/relay/relay-network.c b/src/plugins/relay/relay-network.c index 054ea4969..ca2c8d878 100644 --- a/src/plugins/relay/relay-network.c +++ b/src/plugins/relay/relay-network.c @@ -53,10 +53,9 @@ gnutls_dh_params_t relay_gnutls_dh_params; void relay_network_set_ssl_cert_key (int verbose) { - int ret; - #ifdef HAVE_GNUTLS char *certkey_path, *certkey_path2; + int ret; gnutls_certificate_free_credentials (relay_gnutls_x509_cred); gnutls_certificate_allocate_credentials (&relay_gnutls_x509_cred); @@ -100,6 +99,9 @@ relay_network_set_ssl_cert_key (int verbose) } free (certkey_path); } +#else + /* make C compiler happy */ + (void) verbose; #endif }