From a2801adffebb6a3679e41789b38ba925ed32832b Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Fri, 6 Jan 2017 08:18:50 -0800 Subject: 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. --- tests/trantest.h | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'tests/trantest.h') 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); }) } -- cgit v1.2.3-70-g09d2