From 4e65bc35ed1049b6becc0950fb50358504a4867d Mon Sep 17 00:00:00 2001 From: NiteHawk Date: Mon, 17 Aug 2015 15:59:19 +0200 Subject: [PATCH] refactor example/c/lib_buffer_unpack.c The example has some duplicated code that somewhat distracts from the main processing loop. I think placing this into a separate function improves readability of the code. --- example/c/lib_buffer_unpack.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/example/c/lib_buffer_unpack.c b/example/c/lib_buffer_unpack.c index a737f630..a143f9e6 100644 --- a/example/c/lib_buffer_unpack.c +++ b/example/c/lib_buffer_unpack.c @@ -41,6 +41,19 @@ size_t receiver_recv(receiver *r, char* buf, size_t try_size) { return actual_size; } +size_t receiver_to_unpacker(receiver* r, size_t request_size, + msgpack_unpacker *unpacker) +{ + // 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)); + } + size_t recv_len = receiver_recv(r, msgpack_unpacker_buffer(unpacker), + request_size); + msgpack_unpacker_buffer_consumed(unpacker, recv_len); + return recv_len; +} + #define EACH_RECV_SIZE 4 void unpack(receiver* r) { @@ -54,17 +67,9 @@ void unpack(receiver* r) { int i = 0; msgpack_unpacked_init(&result); - if (msgpack_unpacker_buffer_capacity(unp) < EACH_RECV_SIZE) { - bool expanded = msgpack_unpacker_reserve_buffer(unp, 100); - assert(expanded); - } - buf = msgpack_unpacker_buffer(unp); - recv_len = receiver_recv(r, buf, EACH_RECV_SIZE); - msgpack_unpacker_buffer_consumed(unp, recv_len); - - - while (recv_len > 0) { + recv_len = receiver_to_unpacker(r, EACH_RECV_SIZE, unp); + while (recv_len > 0) { printf("receive count: %d %zd bytes received.\n", recv_count++, recv_len); ret = msgpack_unpacker_next(unp, &result); while (ret == MSGPACK_UNPACK_SUCCESS) { @@ -85,13 +90,7 @@ void unpack(receiver* r) { msgpack_unpacked_destroy(&result); return; } - if (msgpack_unpacker_buffer_capacity(unp) < EACH_RECV_SIZE) { - bool expanded = msgpack_unpacker_reserve_buffer(unp, 100); - assert(expanded); - } - buf = msgpack_unpacker_buffer(unp); - recv_len = receiver_recv(r, buf, 4); - msgpack_unpacker_buffer_consumed(unp, recv_len); + recv_len = receiver_to_unpacker(r, EACH_RECV_SIZE, unp); } msgpack_unpacked_destroy(&result); }