From 1788d6ce0112d903d04596191564973c61a4f1d3 Mon Sep 17 00:00:00 2001 From: NiteHawk Date: Mon, 17 Aug 2015 21:49:03 +0200 Subject: [PATCH] amend pull request (#344) following the related discussion There's a small problem remaining if assertions are disabled (with -DNDEBUG). --- example/c/lib_buffer_unpack.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/example/c/lib_buffer_unpack.c b/example/c/lib_buffer_unpack.c index 43686207..54ce70f9 100644 --- a/example/c/lib_buffer_unpack.c +++ b/example/c/lib_buffer_unpack.c @@ -46,7 +46,8 @@ size_t receiver_to_unpacker(receiver* r, size_t request_size, { // make sure there's enough room, or expand the unpacker accordingly if (msgpack_unpacker_buffer_capacity(unpacker) < request_size) { - assert(msgpack_unpacker_reserve_buffer(unpacker, request_size)); + bool expanded = msgpack_unpacker_reserve_buffer(unpacker, request_size); + assert(expanded); } size_t recv_len = receiver_recv(r, msgpack_unpacker_buffer(unpacker), request_size); @@ -66,9 +67,9 @@ void unpack(receiver* r) { int i = 0; msgpack_unpacked_init(&result); - - recv_len = receiver_to_unpacker(r, EACH_RECV_SIZE, unp); - while (recv_len > 0) { + while (true) { + recv_len = receiver_to_unpacker(r, EACH_RECV_SIZE, unp); + if (recv_len == 0) break; // (reached end of input) printf("receive count: %d %zd bytes received.\n", recv_count++, recv_len); ret = msgpack_unpacker_next(unp, &result); while (ret == MSGPACK_UNPACK_SUCCESS) { @@ -89,7 +90,6 @@ void unpack(receiver* r) { msgpack_unpacked_destroy(&result); return; } - recv_len = receiver_to_unpacker(r, EACH_RECV_SIZE, unp); } msgpack_unpacked_destroy(&result); }