diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/msgpack/unpack.hpp | 8 | ||||
| -rw-r--r-- | cpp/test/pack_unpack.cc | 10 |
2 files changed, 7 insertions, 11 deletions
diff --git a/cpp/src/msgpack/unpack.hpp b/cpp/src/msgpack/unpack.hpp index 56ce0f6..e1617ef 100644 --- a/cpp/src/msgpack/unpack.hpp +++ b/cpp/src/msgpack/unpack.hpp @@ -160,7 +160,7 @@ private: }; -static bool unpack(unpacked* result, +static void unpack(unpacked* result, const char* data, size_t len, size_t* offset = NULL); @@ -312,7 +312,7 @@ inline void unpacker::remove_nonparsed_buffer() } -inline bool unpack(unpacked* result, +inline void unpack(unpacked* result, const char* data, size_t len, size_t* offset) { msgpack::object obj; @@ -326,12 +326,12 @@ inline bool unpack(unpacked* result, case UNPACK_SUCCESS: result->get() = obj; result->zone() = z; - return false; + return; case UNPACK_EXTRA_BYTES: result->get() = obj; result->zone() = z; - return true; + return; case UNPACK_CONTINUE: throw unpack_error("insufficient bytes"); diff --git a/cpp/test/pack_unpack.cc b/cpp/test/pack_unpack.cc index ca9b7d5..fe4625a 100644 --- a/cpp/test/pack_unpack.cc +++ b/cpp/test/pack_unpack.cc @@ -77,21 +77,17 @@ TEST(unpack, sequence) msgpack::pack(sbuf, 2); msgpack::pack(sbuf, 3); - bool cont; size_t offset = 0; msgpack::unpacked msg; - cont = msgpack::unpack(&msg, sbuf.data(), sbuf.size(), &offset); - EXPECT_TRUE(cont); + msgpack::unpack(&msg, sbuf.data(), sbuf.size(), &offset); EXPECT_EQ(1, msg.get().as<int>()); - cont = msgpack::unpack(&msg, sbuf.data(), sbuf.size(), &offset); - EXPECT_TRUE(cont); + msgpack::unpack(&msg, sbuf.data(), sbuf.size(), &offset); EXPECT_EQ(2, msg.get().as<int>()); - cont = msgpack::unpack(&msg, sbuf.data(), sbuf.size(), &offset); - EXPECT_FALSE(cont); + msgpack::unpack(&msg, sbuf.data(), sbuf.size(), &offset); EXPECT_EQ(3, msg.get().as<int>()); } |