# HG changeset patch
# User Sebastien Decugis <sdecugis@freediameter.net>
# Date 1368072363 -28800
# Node ID 40b48a3997a25aabc887342ab93491a7f5edff85
# Parent  f38d77f9cfd32478b355a15f7b269f0de8f7ead0# Parent  4b7192d0ffde3629f0b9b05db879e09d18170ba6
Merged

diff -r f38d77f9cfd3 -r 40b48a3997a2 include/freeDiameter/libfdcore.h
--- a/include/freeDiameter/libfdcore.h	Thu May 09 11:59:34 2013 +0800
+++ b/include/freeDiameter/libfdcore.h	Thu May 09 12:06:03 2013 +0800
@@ -949,7 +949,7 @@
 		 */
 	
 	HOOK_MESSAGE_FAILOVER,
-		/* Hook called when a message that was sent to a peer is being requeued, because e.g. the connection was teared down.
+		/* Hook called when a message that was sent to a peer is being requeued, because e.g. the connection was torn down.
 		   In that case the message will go again through the routing process.
 		 - {msg} points to the corresponding request message (the answer is discarded). Again, the objects may not have been dictionary resolved. If you
 		   try to call fd_msg_parse_dict, it might slow down the operation of a relay agent, although this hook is not on the normal execution path.
@@ -1018,7 +1018,7 @@
 };
 
 
-/* Type if the {permsgdata}. It is up to each extension to define its own structure. This is opaque for the framework. */
+/* Type of the {permsgdata} pointer. It is up to each extension to define its own structure. This is opaque for the framework. */
 struct fd_hook_permsgdata;
 
 /* A handle that will be associated with the extension, and with the permsgdata structures. */
diff -r f38d77f9cfd3 -r 40b48a3997a2 include/freeDiameter/libfdproto.h
--- a/include/freeDiameter/libfdproto.h	Thu May 09 11:59:34 2013 +0800
+++ b/include/freeDiameter/libfdproto.h	Thu May 09 12:06:03 2013 +0800
@@ -79,9 +79,7 @@
 #include <unistd.h>
 #include <stdarg.h>
 
-#ifdef DEBUG
-#include <libgen.h>	/* for basename if --dbg_file is specified */
-#endif /* DEBUG */
+#include <libgen.h>	/* for basename */
 
 #ifdef SWIG
 #define _ATTRIBUTE_PRINTFLIKE_(_f,_v)
diff -r f38d77f9cfd3 -r 40b48a3997a2 libfdcore/cnxctx.c
--- a/libfdcore/cnxctx.c	Thu May 09 11:59:34 2013 +0800
+++ b/libfdcore/cnxctx.c	Thu May 09 12:06:03 2013 +0800
@@ -1757,7 +1757,7 @@
 #endif /* DISABLE_SCTP */
 	
 		default:
-			TRACE_DEBUG(INFO, "Unknwon protocol: %d", conn->cc_proto);
+			TRACE_DEBUG(INFO, "Unknown protocol: %d", conn->cc_proto);
 			ASSERT(0);
 			return ENOTSUP;	/* or EINVAL... */
 	}
diff -r f38d77f9cfd3 -r 40b48a3997a2 libfdcore/p_sr.c
--- a/libfdcore/p_sr.c	Thu May 09 11:59:34 2013 +0800
+++ b/libfdcore/p_sr.c	Thu May 09 12:06:03 2013 +0800
@@ -195,7 +195,7 @@
 		/* loop */
 	} while (1);
 error:	
-	; /* pthread_cleanup_pop sometimes expands as "} ..." and the label beofre this cause some compilers to complain... */
+	; /* pthread_cleanup_pop sometimes expands as "} ..." and the label before this cause some compilers to complain... */
 	pthread_cleanup_pop( 1 );
 	ASSERT(0); /* we have encountered a problem, maybe time to signal the framework to terminate? */
 	return NULL;
diff -r f38d77f9cfd3 -r 40b48a3997a2 libfdproto/messages.c
--- a/libfdproto/messages.c	Thu May 09 11:59:34 2013 +0800
+++ b/libfdproto/messages.c	Thu May 09 12:06:03 2013 +0800
@@ -1254,8 +1254,8 @@
 	if (! (msg->msg_public.msg_flags & CMD_FLAG_REQUEST ))
 		return anscb ? EINVAL : 0; /* we associate with requests only */
 	
-	CHECK_PARAMS( (anscb == NULL)    || (msg->msg_cb.anscb == NULL) ); /* We are not overwritting a cb */
-	CHECK_PARAMS( (expirecb == NULL) || (msg->msg_cb.expirecb == NULL) ); /* We are not overwritting a cb */
+	CHECK_PARAMS( (anscb == NULL)    || (msg->msg_cb.anscb == NULL) ); /* We are not overwriting a cb */
+	CHECK_PARAMS( (expirecb == NULL) || (msg->msg_cb.expirecb == NULL) ); /* We are not overwriting a cb */
 	
 	/* Associate callback and data with the message, if any */
 	msg->msg_cb.anscb = anscb;