Merge branch 'master' into master

libknet/libknet.h

@@ -99,7 +99,7 @@ typedef struct knet_handle *knet_handle_t;
  *
  * host_id  - Each host in a knet is identified with a unique
  *            ID. when creating a new handle local host_id
- *            must be specified (0 to UINT16T_MAX are all valid).
+ *            must be specified (0 to UINT16_MAX are all valid).
  *            It is the user's responsibility to check that the value
  *            is unique, or bad things might happen.
  *

libknet/tests/api_knet_get_transport_id_by_name.c

@@ -41,7 +41,7 @@ static void test(void)
 
 	id = knet_get_transport_id_by_name("UDP");
 	if (id != KNET_TRANSPORT_UDP) {
-		printf("knet_handle_get_transport_id_by_name failed: %s\n", strerror(errno));
+		printf("knet_get_transport_id_by_name failed: %s\n", strerror(errno));
 		exit(FAIL);
 	}
 }

libknet/tests/api_knet_get_transport_list.c

@@ -28,7 +28,7 @@ static void test(void)
 
 	memset(transport_list, 0, sizeof(transport_list));
 
-	printf("Test knet_handle_get_transport_list with no entries_list\n");
+	printf("Test knet_get_transport_list with no entries_list\n");
 
 	if ((!knet_get_transport_list(transport_list, NULL)) || (errno != EINVAL)) {
 		printf("knet_get_transport_list accepted invalid list_entries or returned incorrect error: %s\n", strerror(errno));

libknet/tests/api_knet_get_transport_name_by_id.c

@@ -23,7 +23,7 @@ static void test(void)
 {
 	const char *name = NULL;
 
-	printf("Test knet_handle_get_transport_name_by_id with incorrect transport\n");
+	printf("Test knet_get_transport_name_by_id with incorrect transport\n");
 
 	if ((knet_get_transport_name_by_id(KNET_MAX_TRANSPORTS) != NULL) || (errno != EINVAL)) {
 		printf("knet_get_transport_name_by_id accepted invalid transport or returned incorrect error: %s\n", strerror(errno));