Message API was awkward.

The use of a single function to get both size and length actually
turned out to be awkward to use; better to have separate functions
to get each.  While here, disable some of the initialization/fork
checks, because it turns out they aren't needed.

3 files changed, 18 insertions, 34 deletions

diff --git a/tests/reqrep.c b/tests/reqrep.c
index d182559d..1bdef4fd 100644
--- a/tests/reqrep.c
+++ b/tests/reqrep.c
@@ -91,30 +91,25 @@ Main({
 			Convey("They can REQ/REP exchange", {
 				nng_msg *ping;
 				nng_msg *pong;
-				char *body;
-				size_t len;
 
 				So(nng_msg_alloc(&ping, 0) == 0);
 				So(nng_msg_append(ping, "ping", 5) == 0);
-				body = nng_msg_body(ping, &len);
-				So(len == 5);
-				So(memcmp(body, "ping", 5) == 0);
+				So(nng_msg_len(ping) == 5);
+				So(memcmp(nng_msg_body(ping), "ping", 5) == 0);
 				So(nng_sendmsg(req, ping, 0) == 0);
 				pong = NULL;
 				So(nng_recvmsg(rep, &pong, 0) == 0);
 				So(pong != NULL);
-				body = nng_msg_body(pong, &len);
-				So(len == 5);
-				So(memcmp(body, "ping", 5) == 0);
+				So(nng_msg_len(pong) == 5);
+				So(memcmp(nng_msg_body(pong), "ping", 5) == 0);
 				nng_msg_trim(pong, 5);
 				So(nng_msg_append(pong, "pong", 5) == 0);
 				So(nng_sendmsg(rep, pong, 0) == 0);
 				ping = 0;
 				So(nng_recvmsg(req, &ping, 0) == 0);
 				So(ping != NULL);
-				body = nng_msg_body(ping, &len);
-				So(len == 5);
-				So(memcmp(body, "pong", 5) == 0);
+				So(nng_msg_len(ping) == 5);
+				So(memcmp(nng_msg_body(ping), "pong", 5) == 0);
 				nng_msg_free(ping);
 			})
 		})
@@ -124,9 +119,8 @@ Main({
 			nng_msg *def;
 			nng_msg *cmd;
 			nng_msg *nvm;
-			char *body;
-			size_t len;
 			uint64_t retry = 100000;	// 100 ms
+			size_t len;
 
 			nng_socket *req;
 			nng_socket *rep;
@@ -166,9 +160,8 @@ Main({
 
 			So(nng_recvmsg(req, &cmd, 0) == 0);
 
-			body = nng_msg_body(cmd, &len);
-			So(len == 4);
-			So(memcmp(body, "def", 4) == 0);
+			So(nng_msg_len(cmd) == 4);
+			So(memcmp(nng_msg_body(cmd), "def", 4) == 0);
 			nng_msg_free(cmd);
 		})
 	})
diff --git a/tests/sock.c b/tests/sock.c
index e0743936..78d97a9b 100644
--- a/tests/sock.c
+++ b/tests/sock.c
@@ -148,8 +148,6 @@ TestMain("Socket Operations", {
 			nng_socket *sock2 = NULL;
 			int len = 1;
 			nng_msg *msg;
-			size_t sz;
-			char *ptr;
 			uint64_t second = 1000000;
 
 			rv = nng_open(&sock2, NNG_PROTO_PAIR);
@@ -181,11 +179,9 @@ TestMain("Socket Operations", {
 
 			rv = nng_msg_alloc(&msg, 3);
 			So(rv == 0);
-			ptr = nng_msg_body(msg, &sz);
-			So(ptr != NULL);
-			So(sz == 3);
-
-			memcpy(ptr, "abc", 3);
+			So(nng_msg_len(msg) == 3);
+			So(nng_msg_body(msg) != NULL);
+			memcpy(nng_msg_body(msg), "abc", 3);
 
 			rv = nng_sendmsg(sock, msg, 0);
 			So(rv == 0);
@@ -194,10 +190,8 @@ TestMain("Socket Operations", {
 			rv = nng_recvmsg(sock2, &msg, 0);
 			So(rv == 0);
 			So(msg != NULL);
-			ptr = nng_msg_body(msg, &sz);
-			So(ptr != NULL);
-			So(sz == 3);
-			So(memcmp(ptr, "abc", 3) == 0);
+			So(nng_msg_len(msg) == 3);
+			So(memcmp(nng_msg_body(msg), "abc", 3) == 0);
 			nng_msg_free(msg);
 			nng_close(sock2);
 		})
diff --git a/tests/trantest.h b/tests/trantest.h
index 9cd222fb..bd458d21 100644
--- a/tests/trantest.h
+++ b/tests/trantest.h
@@ -99,7 +99,6 @@ trantest_send_recv(trantest *tt)
 		nng_endpoint *ep = NULL;
 		nng_msg *send;
 		nng_msg *recv;
-		char *body;
 		size_t len;
 
 		ep = NULL;
@@ -118,9 +117,8 @@ trantest_send_recv(trantest *tt)
 		recv = NULL;
 		So(nng_recvmsg(tt->repsock, &recv, 0) == 0);
 		So(recv != NULL);
-		So((body = nng_msg_body(recv, &len)) != NULL);
-		So(len == 5);
-		So(strcmp(body, "ping") == 0);
+		So(nng_msg_len(recv) == 5);
+		So(strcmp(nng_msg_body(recv), "ping") == 0);
 		nng_msg_free(recv);
 
 		len = strlen("acknowledge");
@@ -129,9 +127,8 @@ trantest_send_recv(trantest *tt)
 		So(nng_sendmsg(tt->repsock, send, 0) == 0);
 		So(nng_recvmsg(tt->reqsock, &recv, 0) == 0);
 		So(recv != NULL);
-		So((body = nng_msg_body(recv, &len)) != NULL);
-		So(len == strlen("acknowledge"));
-		So(strcmp(body, "acknowledge") == 0);
+		So(nng_msg_len(recv) == strlen("acknowledge"));
+		So(strcmp(nng_msg_body(recv), "acknowledge") == 0);
 		nng_msg_free(recv);
 	})
 }