--- a/include/freeDiameter/extension.h	Sun Mar 17 16:23:12 2013 +0100
+++ b/include/freeDiameter/extension.h	Mon Mar 18 13:22:07 2013 +0100
@@ -51,14 +51,14 @@
 int fd_ext_init(int major, int minor, char * conffile) {				\
 	if ((major != FD_PROJECT_VERSION_MAJOR)						\
 		|| (minor != FD_PROJECT_VERSION_MINOR)) {				\
-		TRACE_ERROR("This extension (" _name ") was compiled for a different version of freeDiameter.\n");	\
+		TRACE_ERROR("This extension (" _name ") was compiled for a different version of freeDiameter.");	\
 		TRACE_DEBUG(INFO, "daemon %d.%d != ext %d.%d",				\
 			major, minor,							\
 			FD_PROJECT_VERSION_MAJOR, FD_PROJECT_VERSION_MINOR);		\
 		return EINVAL;								\
 	}										\
 	if (extension_loaded) {								\
-		TRACE_ERROR("Extension (" _name ") cannot be loaded twice!\n");		\
+		TRACE_ERROR("Extension (" _name ") cannot be loaded twice!");		\
 		return ENOTSUP;								\
 	}										\
 	extension_loaded++;								\

--- a/libfdcore/config.c	Sun Mar 17 16:23:12 2013 +0100
+++ b/libfdcore/config.c	Mon Mar 18 13:22:07 2013 +0100
@@ -261,7 +261,7 @@
 	
 	/* Check that TLS private key was given */
 	if (! fd_g_config->cnf_sec_data.key_file) {
-		TRACE_ERROR( "Missing private key configuration for TLS. Please provide the TLS_cred configuration directive.\n");
+		TRACE_ERROR( "Missing private key configuration for TLS. Please provide the TLS_cred configuration directive.");
 		return EINVAL;
 	}
 	
@@ -294,9 +294,8 @@
 
 		ret = getaddrinfo(buf, NULL, &hints, &info);
 		if (ret != 0) {
-			TRACE_ERROR( "Error resolving local FQDN :\n"
-					" '%s' : %s\n"
-					"Please provide Identity in configuration file.\n",
+			TRACE_ERROR( "Error resolving local FQDN : '%s' : %s"
+					". Please provide Identity in configuration file.",
 					buf, gai_strerror(ret));
 			return EINVAL;
 		}
@@ -314,8 +313,8 @@
 		/* Check the diameter identity is a fqdn */
 		start = strchr(fd_g_config->cnf_diamid, '.');
 		if ((start == NULL) || (start[1] == '\0')) {
-			TRACE_ERROR( "Unable to extract realm from the Identity '%s'.\n"
-					"Please fix your Identity setting or provide Realm.\n",
+			TRACE_ERROR( "Unable to extract realm from the Identity '%s'."
+					" Please fix your Identity setting or provide Realm.",
 					fd_g_config->cnf_diamid);
 			return EINVAL;
 		}
@@ -328,11 +327,11 @@
 	
 	/* Validate some flags */
 	if (fd_g_config->cnf_flags.no_ip4 && fd_g_config->cnf_flags.no_ip6) {
-		TRACE_ERROR( "IP and IPv6 cannot be disabled at the same time.\n");
+		TRACE_ERROR( "IP and IPv6 cannot be disabled at the same time.");
 		return EINVAL;
 	}
 	if (fd_g_config->cnf_flags.no_tcp && fd_g_config->cnf_flags.no_sctp) {
-		TRACE_ERROR( "TCP and SCTP cannot be disabled at the same time.\n");
+		TRACE_ERROR( "TCP and SCTP cannot be disabled at the same time.");
 		return EINVAL;
 	}
 	

--- a/libfdcore/core.c	Sun Mar 17 16:23:12 2013 +0100
+++ b/libfdcore/core.c	Mon Mar 18 13:22:07 2013 +0100
@@ -193,7 +193,7 @@
 	#endif /* GNUTLS_VERSION_210 */
 	CHECK_GNUTLS_DO( gnutls_global_init(), return EINVAL );
 	if ( ! gnutls_check_version(GNUTLS_VERSION) ) {
-		TRACE_ERROR( "The GNUTLS library is too old; found '%s', need '" GNUTLS_VERSION "'\n", gnutls_check_version(NULL));
+		TRACE_ERROR( "The GNUTLS library is too old; found '%s', need '" GNUTLS_VERSION "'", gnutls_check_version(NULL));
 		return EINVAL;
 	} else {
 	#ifdef GNUTLS_VERSION_210
@@ -316,7 +316,7 @@
 		/* Just wait for core_runner_thread to complete and return gracefully */
 		ret = pthread_join(core_runner, &th_ret);
 		if (ret != 0) {
-			TRACE_ERROR( "Unable to wait for main framework thread termination: %s\n", strerror(ret));
+			TRACE_ERROR( "Unable to wait for main framework thread termination: %s", strerror(ret));
 			return ret;
 		}
 	}

--- a/tests/tests.h	Sun Mar 17 16:23:12 2013 +0100
+++ b/tests/tests.h	Mon Mar 18 13:22:07 2013 +0100
@@ -74,7 +74,7 @@
 
 /* Define the macro to pass a test */
 #define PASSTEST( ){					\
-	TRACE_NOTICE("Test %s passed\n", __FILE__);	\
+	TRACE_NOTICE("Test %s passed", __FILE__);	\
 	TRACE_DEBUG(INFO, "Test passed");		\
 	(void)fd_core_shutdown();			\
 	(void)fd_core_wait_shutdown_complete();		\
@@ -91,13 +91,13 @@
 	if (test_verbo > 0) {				\
 		TRACE_ERROR(				\
 			"%s:%-4d: CHECK( " #_assert " == "\
-				#_val " )\n",		\
+				#_val " )",		\
 			__FILE__, 			\
 			__LINE__);			\
 	}{						\
 	__typeof__ (_val) __ret = (_assert);		\
 	if (__ret != (_val)) {				\
-		FAILTEST( "%s:%d: CHECK FAILED : %s == %lx != %lx\n",	\
+		FAILTEST( "%s:%d: CHECK FAILED : %s == %lx != %lx",	\
 			__FILE__,			\
 			__LINE__,			\
 			#_assert,			\