# HG changeset patch
# User Sebastien Decugis <sdecugis@freediameter.net>
# Date 1363960108 -3600
# Node ID d3d2a32320c4daf5fd828bc6ce3a1f004cac5804
# Parent  fcd20eb4907be8d36ec37d279da77cf19f20f07a
Fix a compilation warning and protect CHECK_GNUTLS_DO macro

diff -r fcd20eb4907b -r d3d2a32320c4 include/freeDiameter/libfdcore.h
--- a/include/freeDiameter/libfdcore.h	Fri Mar 22 01:00:52 2013 +0100
+++ b/include/freeDiameter/libfdcore.h	Fri Mar 22 14:48:28 2013 +0100
@@ -59,10 +59,10 @@
 /* Check the return value of a GNUTLS function, log and propagate */
 #define CHECK_GNUTLS_DO( __call__, __fallback__ ) {						\
 	int __ret__;										\
-	TRACE_DEBUG(GNUTLS_DBG_LEVEL, "GNUTLS call: " #__call__ );				\
+	TRACE_DEBUG(GNUTLS_DBG_LEVEL, "GNUTLS call: %s", #__call__ );				\
 	__ret__ = (__call__);									\
 	if (__ret__ < 0) {									\
-		TRACE_DEBUG(INFO, "Error in '" #__call__ "':\t%s", gnutls_strerror(__ret__));	\
+		TRACE_DEBUG(INFO, "Error in '%s':\t%s", #__call__ , gnutls_strerror(__ret__));	\
 		__fallback__;									\
 	}											\
 }
diff -r fcd20eb4907b -r d3d2a32320c4 libfdcore/config.c
--- a/libfdcore/config.c	Fri Mar 22 01:00:52 2013 +0100
+++ b/libfdcore/config.c	Fri Mar 22 14:48:28 2013 +0100
@@ -477,7 +477,7 @@
 			GNUTLS_TRACE( gnutls_certificate_get_x509_crls (fd_g_config->cnf_sec_data.credentials, &CRL_list, (unsigned int *) &CRL_list_length) );
 			CHECK_GNUTLS_DO( gnutls_x509_crt_list_verify(certs, cert_max, CA_list, CA_list_length, CRL_list, CRL_list_length, 0, &verify),
 				{
-					TRACE_ERROR(INFO, "Failed to verify the local certificate '%s' against local credentials. Please check your certificate is valid.", fd_g_config->cnf_sec_data.cert_file);
+					TRACE_ERROR("Failed to verify the local certificate '%s' against local credentials. Please check your certificate is valid.", fd_g_config->cnf_sec_data.cert_file);
 					return EINVAL;
 				} );