Mercurial > hg > freeDiameter

changeset 979:b90cb4c07160

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove more newlines.
author Thomas Klausner <tk@giga.or.at>
date Thu, 14 Mar 2013 18:45:03 +0100
parents d978078db9d7
children 0f376cab3dcb
files doc/dbg_interactive.py.sample extensions/app_acct/acct_conf.y extensions/app_acct/acct_records.c extensions/app_radgw/radius.c extensions/app_radgw/rgw_worker.c extensions/app_radgw/rgwx_auth.c extensions/app_radgw/rgwx_echodrop.c extensions/dbg_interactive/dbg_interactive.i extensions/dbg_interactive/dictionary.i extensions/dbg_interactive/dispatch.i extensions/dbg_interactive/lists.i extensions/dbg_interactive/messages.i extensions/dbg_interactive/peers.i extensions/dbg_interactive/routing.i extensions/dbg_interactive/sessions.i extensions/test_netemul/test_netemul.y libfdcore/fdd.l libfdcore/server.c libfdproto/dictionary.c libfdproto/messages.c libfdproto/sessions.c
diffstat 21 files changed, 59 insertions(+), 65 deletions(-) [+]
line wrap: on
line diff
--- a/doc/dbg_interactive.py.sample	Thu Mar 14 18:44:58 2013 +0100
+++ b/doc/dbg_interactive.py.sample	Thu Mar 14 18:45:03 2013 +0100
@@ -52,7 +52,7 @@
 # Print messages to freeDiameter's debug facility
 # Note: the python version does not support printf-like argument list. The formating should be done in python.
 #       See SWIG documentation about varargs functions for more information.
-fd_log_debug_fstr(None, "3 + 4 = %d\n" % (7))
+fd_log_debug_fstr(None, "3 + 4 = %d" % (7))
 
 
 # Display some framework state information
--- a/extensions/app_acct/acct_conf.y	Thu Mar 14 18:44:58 2013 +0100
+++ b/extensions/app_acct/acct_conf.y	Thu Mar 14 18:45:03 2013 +0100
@@ -83,7 +83,7 @@
 	
 	if ( ! acct_config->conninfo) {
 		fd_log_debug("[app_acct] ERROR: 'ConnInfo' is missing in file '%s'."
-			" You can specify 'ConnInfo=\"\";' to use default parameters.\n", conffile);
+			" You can specify 'ConnInfo=\"\";' to use default parameters.", conffile);
 		return EINVAL;
 	}
 	if ( ! acct_config->tablename) {
--- a/extensions/app_acct/acct_records.c	Thu Mar 14 18:44:58 2013 +0100
+++ b/extensions/app_acct/acct_records.c	Thu Mar 14 18:45:03 2013 +0100
@@ -126,8 +126,8 @@
 	/* Check at least one AVP was mapped */
 	if (records->nball == records->nbunmap) {
 		fd_log_debug("The received ACR does not contain any AVP from the configuration file."
-				"This is an invalid situation. Please fix your configuration file.\n"
-				"One way to ensure this does not happen is to include Session-Id in the database.\n");
+				" This is an invalid situation. Please fix your configuration file."
+				" One way to ensure this does not happen is to include Session-Id in the database.");
 		acct_rec_empty(records);
 		return EINVAL;
 	}
--- a/extensions/app_radgw/radius.c	Thu Mar 14 18:44:58 2013 +0100
+++ b/extensions/app_radgw/radius.c	Thu Mar 14 18:45:03 2013 +0100
@@ -327,14 +327,14 @@
 			auth[8],  auth[9],  auth[10], auth[11], auth[12], auth[13], auth[14], auth[15]);
 	for (i = 0; i < msg->radius.attr_used; i++) {
 		struct radius_attr_hdr *attr = (struct radius_attr_hdr *)(msg->radius.buf + msg->radius.attr_pos[i]);
-		fd_log_debug("    - Type: 0x%02hhx (%s)\n       Len: %-3hhu", attr->type, rgw_msg_attrtype_str(attr->type), attr->length);
+		fd_log_debug("    - Type: 0x%02hhx (%s)       Len: %-3hhu", attr->type, rgw_msg_attrtype_str(attr->type), attr->length);
 		radius_msg_dump_attr_val(attr);
 	}
 	if (has_meta && msg->ps_nb) {
 		fd_log_debug("---- hidden attributes:");
 		for (i = msg->ps_first; i < msg->ps_first + msg->ps_nb; i++) {
 			struct radius_attr_hdr *attr = (struct radius_attr_hdr *)(msg->radius.buf + msg->radius.attr_pos[i]);
-			fd_log_debug("    - Type: 0x%02hhx (%s)\n       Len: %-3hhu", attr->type, rgw_msg_attrtype_str(attr->type), attr->length);
+			fd_log_debug("    - Type: 0x%02hhx (%s)       Len: %-3hhu", attr->type, rgw_msg_attrtype_str(attr->type), attr->length);
 			radius_msg_dump_attr_val(attr);
 		}
 	}
@@ -354,8 +354,7 @@
 					   RADIUS_ATTR_MESSAGE_AUTHENTICATOR,
 					   auth, MD5_MAC_LEN);
 		if (attr == NULL) {
-			printf("WARNING: Could not add "
-			       "Message-Authenticator\n");
+			printf("WARNING: Could not add Message-Authenticator\n");
 			return -1;
 		}
 		msg->hdr->length = htons(msg->buf_used);
@@ -692,8 +691,7 @@
 		tmp = radius_get_attr_hdr(msg, i);
 		if (tmp->type == RADIUS_ATTR_MESSAGE_AUTHENTICATOR) {
 			if (attr != NULL) {
-				printf("Multiple Message-Authenticator "
-				       "attributes in RADIUS message\n");
+				printf("Multiple Message-Authenticator attributes in RADIUS message\n");
 				return 1;
 			}
 			attr = tmp;
--- a/extensions/app_radgw/rgw_worker.c	Thu Mar 14 18:44:58 2013 +0100
+++ b/extensions/app_radgw/rgw_worker.c	Thu Mar 14 18:45:03 2013 +0100
@@ -163,7 +163,7 @@
 		/* Check the created Diameter message -- it will be invalid if no callback has handled the RADIUS message */
 		if ((diam_msg == NULL) || ( fd_msg_parse_rules(diam_msg, fd_g_config->cnf_dict, NULL) ) ) {
 			fd_log_debug("[radgw] No or invalid Diameter message was generated after processing the RADIUS command %hhd (%s)."
-					" It may indicate a gateway configuration problem, or implementation issue in a plugin.\n",
+					" It may indicate a gateway configuration problem, or implementation issue in a plugin.",
 					msg->radius.hdr->code, rgw_msg_code_str(msg->radius.hdr->code));
 			/* We should also dump the conflicting rule here to help debug? */
 			pb++;
@@ -279,7 +279,7 @@
 		}
 
 		if (pb) {
-			TRACE_DEBUG(INFO, "[radgw] WARNING: %d mandatory AVP in the Diameter answer have not been translated to RADIUS!\n Please use debug.rgwx for more information.", pb);
+			TRACE_DEBUG(INFO, "[radgw] WARNING: %d mandatory AVP in the Diameter answer have not been translated to RADIUS! Please use debug.rgwx for more information.", pb);
 		}
 	}
 	
--- a/extensions/app_radgw/rgwx_auth.c	Thu Mar 14 18:44:58 2013 +0100
+++ b/extensions/app_radgw/rgwx_auth.c	Thu Mar 14 18:45:03 2013 +0100
@@ -1449,7 +1449,7 @@
 					/* We only check the value */
 					if (ahdr->avp_value->u32 != 3) {
 						fd_log_debug("[auth.rgwx] Received Diameter answer with Auth-Request-Type set to %d (%s) from server %.*s, session %.*s."
-								"  This may cause interoperability problems with RADIUS.\n",
+								"  This may cause interoperability problems with RADIUS.",
 								ahdr->avp_value->u32,
 								(ahdr->avp_value->u32 == 1) ? "AUTHENTICATE_ONLY" :
 									((ahdr->avp_value->u32 == 2) ? "AUTHORIZE_ONLY" : "???"),
--- a/extensions/app_radgw/rgwx_echodrop.c	Thu Mar 14 18:44:58 2013 +0100
+++ b/extensions/app_radgw/rgwx_echodrop.c	Thu Mar 14 18:45:03 2013 +0100
@@ -219,8 +219,8 @@
 		CHECK_PARAMS_DO(*session,
 			{
 				fd_log_debug(	"[echodrop.rgwx] The extension is configured to echo some attributes from this message, but no session object has been created for it (yet)."
-						"  Please check your configuration file and include a session-generating extension BEFORE calling echodrop.rgwx to echo attributes.\n"
-						"  Please use debug.rgwx to retrieve more information.\n" );
+						" Please check your configuration file and include a session-generating extension BEFORE calling echodrop.rgwx to echo attributes."
+						" Please use debug.rgwx to retrieve more information." );
 				return EINVAL;
 			} );
 		
--- a/extensions/dbg_interactive/dbg_interactive.i	Thu Mar 14 18:44:58 2013 +0100
+++ b/extensions/dbg_interactive/dbg_interactive.i	Thu Mar 14 18:45:03 2013 +0100
@@ -69,7 +69,7 @@
 static PyObject* wrapper_errno_py;
 static const char * wrapper_error_txt; /* if NULL, use strerror(errno) */
 #define DI_ERROR(code, pycode, str) {	\
-	fd_log_debug("[dbg_interactive] ERROR: %s: %s\n", __PRETTY_FUNCTION__, str ? str : strerror(code)); \
+	fd_log_debug("[dbg_interactive] ERROR: %s: %s", __PRETTY_FUNCTION__, str ? str : strerror(code)); \
 	wrapper_errno = code;		\
 	wrapper_errno_py = pycode;	\
 	wrapper_error_txt = str;	\
--- a/extensions/dbg_interactive/dictionary.i	Thu Mar 14 18:44:58 2013 +0100
+++ b/extensions/dbg_interactive/dictionary.i	Thu Mar 14 18:45:03 2013 +0100
@@ -239,7 +239,7 @@
 		fd_log_debug("l:%u, v:[", $self->len);
 		for (i=0; i < n; i++)
 			fd_log_debug("%02.2X", $self->data[i]);
-		fd_log_debug("] '%.*s%s'\n", n, $self->data, n == LEN_MAX ? "..." : "");
+		fd_log_debug("] '%.*s%s'", n, $self->data, n == LEN_MAX ? "..." : "");
 	}
 	%cstring_output_allocate_size(char ** outbuffer, size_t * outlen, free(*$1));
 	void as_str ( char ** outbuffer, size_t * outlen ) {
--- a/extensions/dbg_interactive/dispatch.i	Thu Mar 14 18:44:58 2013 +0100
+++ b/extensions/dbg_interactive/dispatch.i	Thu Mar 14 18:45:03 2013 +0100
@@ -46,7 +46,7 @@
 	int ret = 0;
 	
 	if (!pycb) {
-		fd_log_debug("Internal error: missing the callback!\n");
+		fd_log_debug("Internal error: missing the callback!");
 		return ENOTSUP;
 	}
 	cb = pycb;
@@ -62,35 +62,35 @@
 	
 	/* The result is supposedly composed of: [ ret, *msg, *action ] */
 	if ((result == NULL) || (!PyList_Check(result)) || (PyList_Size(result) != 3)) {
-		fd_log_debug("Error: The Python callback did not return [ ret, msg, action ].\n");
+		fd_log_debug("Error: The Python callback did not return [ ret, msg, action ].");
 		ret = EINVAL;
 		goto out;
 	}
 	
 	/* Convert the return values */
 	if (!SWIG_IsOK(SWIG_AsVal_int(PyList_GetItem(result, 0), &ret))) {
-		fd_log_debug("Error: Cannot convert the first return value to integer.\n");
+		fd_log_debug("Error: Cannot convert the first return value to integer.");
 		ret = EINVAL;
 		goto out;
 	}
 	if (ret) {
-		TRACE_DEBUG(INFO, "The Python callback returned the error code %d (%s)\n", ret, strerror(ret));
+		TRACE_DEBUG(INFO, "The Python callback returned the error code %d (%s)", ret, strerror(ret));
 		goto out;
 	}
 	
 	if (!SWIG_IsOK(SWIG_ConvertPtr(PyList_GetItem(result, 1), (void *)msg, SWIGTYPE_p_msg, SWIG_POINTER_DISOWN))) {
-		fd_log_debug("Error: Cannot convert the second return value to message.\n");
+		fd_log_debug("Error: Cannot convert the second return value to message.");
 		ret = EINVAL;
 		goto out;
 	}
 	
 	if (!SWIG_IsOK(SWIG_AsVal_int(PyList_GetItem(result, 2), (int *)action))) {
-		fd_log_debug("Error: Cannot convert the third return value to integer.\n");
+		fd_log_debug("Error: Cannot convert the third return value to integer.");
 		ret = EINVAL;
 		goto out;
 	}
 	
-	TRACE_DEBUG(FULL, "Python callback return: *action = %d\n", *action);
+	TRACE_DEBUG(FULL, "Python callback return: *action = %d", *action);
 out:	
 	Py_XDECREF(result);
 	
--- a/extensions/dbg_interactive/lists.i	Thu Mar 14 18:44:58 2013 +0100
+++ b/extensions/dbg_interactive/lists.i	Thu Mar 14 18:45:03 2013 +0100
@@ -56,11 +56,11 @@
 	}
 	/* For debug, show the values of the list */
 	void dump() {
-		fd_log_debug("list: %p\n", $self);
-		fd_log_debug("  - next: %p\n", $self->next);
-		fd_log_debug("  - prev: %p\n", $self->prev);
-		fd_log_debug("  - head: %p\n", $self->head);
-		fd_log_debug("  - o   : %p\n", $self->o);
+		fd_log_debug("list: %p", $self);
+		fd_log_debug("  - next: %p", $self->next);
+		fd_log_debug("  - prev: %p", $self->prev);
+		fd_log_debug("  - head: %p", $self->head);
+		fd_log_debug("  - o   : %p", $self->o);
 	}
 	/* Insert before/after wrapper */
 	void insert_prev(struct fd_list * li) {
--- a/extensions/dbg_interactive/messages.i	Thu Mar 14 18:44:58 2013 +0100
+++ b/extensions/dbg_interactive/messages.i	Thu Mar 14 18:45:03 2013 +0100
@@ -50,7 +50,7 @@
 	struct anscb_py_layer * l = cbdata;
 	
 	if (!l) {
-		fd_log_debug("Internal error! Python callback disappeared...\n");
+		fd_log_debug("Internal error! Python callback disappeared...");
 		return;
 	}
 	
@@ -71,7 +71,7 @@
 
 		/* The callback is supposed to return a message or NULL */
 		if (!SWIG_IsOK(SWIG_ConvertPtr(result, (void *)msg, SWIGTYPE_p_msg, SWIG_POINTER_DISOWN))) {
-			fd_log_debug("Error: Cannot convert the return value to message.\n");
+			fd_log_debug("Error: Cannot convert the return value to message.");
 			*msg = NULL;
 		}
 
--- a/extensions/dbg_interactive/peers.i	Thu Mar 14 18:44:58 2013 +0100
+++ b/extensions/dbg_interactive/peers.i	Thu Mar 14 18:45:03 2013 +0100
@@ -44,7 +44,7 @@
 	PyObject *result = NULL;
 	
 	if (!data) {
-		TRACE_DEBUG(INFO, "Internal error: missing callback\n");
+		TRACE_DEBUG(INFO, "Internal error: missing callback");
 		return;
 	}
 	PyFunc = data;
@@ -118,7 +118,7 @@
 	int ret = 0;
 	
 	if (!validate_cb2_py) {
-		fd_log_debug("Internal error: missing the callback2!\n");
+		fd_log_debug("Internal error: missing the callback2!");
 		return ENOTSUP;
 	}
 	
@@ -131,7 +131,7 @@
 	
 	/* The result is an integer */
 	if ((result == NULL) || !SWIG_IsOK(SWIG_AsVal_int(result, &ret))) {
-		fd_log_debug("Error: The Python callback did not return an integer.\n");
+		fd_log_debug("Error: The Python callback did not return an integer.");
 		ret = EINVAL;
 		goto out;
 	}
@@ -149,7 +149,7 @@
 	int ret = 0;
 	
 	if (!validate_cb_py) {
-		fd_log_debug("Internal error: missing the callback!\n");
+		fd_log_debug("Internal error: missing the callback!");
 		return ENOTSUP;
 	}
 	
@@ -162,7 +162,7 @@
 	
 	/* The result is supposedly -1, 1, or a cb2 */
 	if (result == NULL) {
-		fd_log_debug("Error: The Python callback did not return a value.\n");
+		fd_log_debug("Error: The Python callback did not return a value.");
 		ret = EINVAL;
 		goto out;
 	}
@@ -170,7 +170,7 @@
 	if (PyCallable_Check(result)) {
 		if (cb2) {
 			if (validate_cb2_py && (validate_cb2_py != result)) {
-				fd_log_debug("Only 1 register callback2 is supported currently\n");
+				fd_log_debug("Only 1 register callback2 is supported currently");
 				ret = ENOTSUP;
 				goto out;
 			}
@@ -184,7 +184,7 @@
 		}
 	} else { /* In this case, the return value must be -1, 0, or 1 */
 		if (!SWIG_IsOK(SWIG_AsVal_int(result, auth))) {
-			fd_log_debug("Error: Cannot convert the return value to integer.\n");
+			fd_log_debug("Error: Cannot convert the return value to integer.");
 			ret = EINVAL;
 			goto out;
 		}
--- a/extensions/dbg_interactive/routing.i	Thu Mar 14 18:44:58 2013 +0100
+++ b/extensions/dbg_interactive/routing.i	Thu Mar 14 18:45:03 2013 +0100
@@ -82,10 +82,10 @@
 
 %extend rtd_candidate {
 	void dump() {
-		fd_log_debug("candidate %p\n", $self);
-		fd_log_debug("  id : %s\n",  $self->diamid);
-		fd_log_debug("  rlm: %s\n", $self->realm);
-		fd_log_debug("  sc : %d\n", $self->score);
+		fd_log_debug("candidate %p", $self);
+		fd_log_debug("  id : %s",  $self->diamid);
+		fd_log_debug("  rlm: %s", $self->realm);
+		fd_log_debug("  sc : %d", $self->score);
 	}
 }
 
@@ -98,7 +98,7 @@
 	int ret = 0;
 	
 	if (!pycb) {
-		fd_log_debug("Internal error: missing the callback!\n");
+		fd_log_debug("Internal error: missing the callback!");
 		return ENOTSUP;
 	}
 	cb = pycb;
@@ -112,24 +112,24 @@
 	
 	/* The result is supposedly composed of: [ ret, *msg ] */
 	if ((result == NULL) || (!PyList_Check(result)) || (PyList_Size(result) != 2)) {
-		fd_log_debug("Error: The Python callback did not return [ ret, msg ].\n");
+		fd_log_debug("Error: The Python callback did not return [ ret, msg ].");
 		ret = EINVAL;
 		goto out;
 	}
 	
 	/* Convert the return values */
 	if (!SWIG_IsOK(SWIG_AsVal_int(PyList_GetItem(result, 0), &ret))) {
-		fd_log_debug("Error: Cannot convert the first return value to integer.\n");
+		fd_log_debug("Error: Cannot convert the first return value to integer.");
 		ret = EINVAL;
 		goto out;
 	}
 	if (ret) {
-		TRACE_DEBUG(INFO, "The Python callback returned the error code %d (%s)\n", ret, strerror(ret));
+		TRACE_DEBUG(INFO, "The Python callback returned the error code %d (%s)", ret, strerror(ret));
 		goto out;
 	}
 	
 	if (!SWIG_IsOK(SWIG_ConvertPtr(PyList_GetItem(result, 1), (void *)msg, SWIGTYPE_p_msg, SWIG_POINTER_DISOWN))) {
-		fd_log_debug("Error: Cannot convert the second return value to message.\n");
+		fd_log_debug("Error: Cannot convert the second return value to message.");
 		ret = EINVAL;
 		goto out;
 	}
@@ -182,7 +182,7 @@
 	int ret = 0;
 	
 	if (!pycb) {
-		fd_log_debug("Internal error: missing the callback!\n");
+		fd_log_debug("Internal error: missing the callback!");
 		return ENOTSUP;
 	}
 	cb = pycb;
@@ -197,14 +197,14 @@
 	
 	/* The result is supposedly composed of: [ ret, *msg ] */
 	if (result == NULL){
-		fd_log_debug("Error: The Python callback raised an exception.\n");
+		fd_log_debug("Error: The Python callback raised an exception.");
 		ret = EINVAL;
 		goto out;
 	}
 	
 	/* Convert the return values */
 	if (!SWIG_IsOK(SWIG_AsVal_int(result, &ret))) {
-		fd_log_debug("Error: Cannot convert the return value to integer.\n");
+		fd_log_debug("Error: Cannot convert the return value to integer.");
 		ret = EINVAL;
 		goto out;
 	}
--- a/extensions/dbg_interactive/sessions.i	Thu Mar 14 18:44:58 2013 +0100
+++ b/extensions/dbg_interactive/sessions.i	Thu Mar 14 18:45:03 2013 +0100
@@ -42,7 +42,7 @@
 static void call_the_python_cleanup_callback(session_state * state, os0_t sid, void * cb) {
 	PyObject *result;
 	if (!cb) {
-		fd_log_debug("Internal error: missing callback object!\n");
+		fd_log_debug("Internal error: missing callback object!");
 		return;
 	}
 	
@@ -127,9 +127,9 @@
 		/* When defining n as OUTPUT parameter, we get something strange... Use fd_sess_fromsid if you need it */
 		#if 0
 		if (n) {
-			fd_log_debug("A new session has been created\n");
+			fd_log_debug("A new session has been created");
 		} else {
-			fd_log_debug("A session with same id already existed\n");
+			fd_log_debug("A session with same id already existed");
 		}
 		#endif /* 0 */
 		
--- a/extensions/test_netemul/test_netemul.y	Thu Mar 14 18:44:58 2013 +0100
+++ b/extensions/test_netemul/test_netemul.y	Thu Mar 14 18:45:03 2013 +0100
@@ -80,7 +80,7 @@
 		TRACE_DEBUG (INFO, "Unable to parse the configuration file.");
 		return EINVAL;
 	} else {
-		TRACE_DEBUG(FULL, "[test_netemul]\n  latency: %lu ms (var:%u%%)\n  duplicates: %G probability.", tne_conf.lat_avg, tne_conf.lat_dev, tne_conf.dupl_proba);
+		TRACE_DEBUG(FULL, "[test_netemul]  latency: %lu ms (var:%u%%)  duplicates: %G probability.", tne_conf.lat_avg, tne_conf.lat_dev, tne_conf.dupl_proba);
 	}
 	
 	return 0;
--- a/libfdcore/fdd.l	Thu Mar 14 18:44:58 2013 +0100
+++ b/libfdcore/fdd.l	Thu Mar 14 18:45:03 2013 +0100
@@ -52,7 +52,7 @@
 	yylloc->first_column = yylloc->last_column + 1; 		\
 	yylloc->last_column = yylloc->first_column + yyleng - 1;	\
 	fd_log_debug(	 						\
-		"(%d:%d-%d:%d) matched rule %d, length=%d, txt='%s'\n",	\
+		"(%d:%d-%d:%d) matched rule %d, length=%d, txt='%s'",	\
 		yylloc->first_line, yylloc->first_column, 		\
 		yylloc->last_line, yylloc->last_column, 		\
 		yy_act, yyleng, yytext); 				\
--- a/libfdcore/server.c	Thu Mar 14 18:44:58 2013 +0100
+++ b/libfdcore/server.c	Thu Mar 14 18:45:03 2013 +0100
@@ -386,9 +386,9 @@
 	if (empty_conf_ep) {
 		CHECK_FCT(fd_cnx_get_local_eps(&fd_g_config->cnf_endpoints));
 		if (FD_IS_LIST_EMPTY(&fd_g_config->cnf_endpoints)) {
-			TRACE_DEBUG(INFO, "Unable to find the address(es) of the local system." 
-					"Please use \"ListenOn\" parameter in the configuration.\n"
-					"This information is required to generate the CER/CEA messages.\n");
+			TRACE_DEBUG(INFO, "Unable to find the address(es) of the local system. " 
+					"Please use \"ListenOn\" parameter in the configuration. "
+					"This information is required to generate the CER/CEA messages.");
 			return EINVAL;
 		}
 	}
--- a/libfdproto/dictionary.c	Thu Mar 14 18:44:58 2013 +0100
+++ b/libfdproto/dictionary.c	Thu Mar 14 18:45:03 2013 +0100
@@ -314,11 +314,7 @@
 			&& (obj->typeyec == dict_obj_info[obj->type].eyecatcher),
 		{
 			if (obj) {
-				TRACE_DEBUG(FULL, "Invalid object : %p"
-						  "     obj->objeyec : %x / %x\n"
-						  "     obj->type    : %d\n"
-						  "     obj->objeyec : %x / %x\n"
-						  "     obj->typeyec : %x / %x", 
+				TRACE_DEBUG(FULL, "Invalid object: %p, obj->objeyec: %x/%x, obj->type: %d, obj->objeyec: %x/%x, obj->typeyec: %x/%x",
 						obj,
 						obj->objeyec, OBJECT_EYECATCHER,
 						obj->type,
--- a/libfdproto/messages.c	Thu Mar 14 18:44:58 2013 +0100
+++ b/libfdproto/messages.c	Thu Mar 14 18:45:03 2013 +0100
@@ -801,7 +801,7 @@
 	
 	/* Check the object */
 	if (!VALIDATE_OBJ(obj)) {
-		CHECK_FCT( dump_add_str(outstr, offset, outlen, ">>> invalid object (%p)!.\n", obj) );
+		CHECK_FCT( dump_add_str(outstr, offset, outlen, ">>> invalid object (%p)!.", obj) );
 		return 0;
 	}
 	
--- a/libfdproto/sessions.c	Thu Mar 14 18:44:58 2013 +0100
+++ b/libfdproto/sessions.c	Thu Mar 14 18:45:03 2013 +0100
@@ -526,7 +526,7 @@
 	CHECK_PARAMS( sid && session );
 	
 	if (!fd_os_is_valid_os0(sid,len)) {
-		TRACE_DEBUG(INFO, "Warning: a Session-Id value contains \\0 chars... (len:%zd, begin:'%.*s')\n => Debug messages may be truncated.", len, len, sid);
+		TRACE_DEBUG(INFO, "Warning: a Session-Id value contains \\0 chars... (len:%zd, begin:'%.*s') => Debug messages may be truncated.", len, len, sid);
 	}
 	
 	/* All the work is done in sess_new */
"Welcome to our mercurial repository"