generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-03-19 21:18:23 +01:00
Code Issues Projects Releases Wiki Activity

fix msgpack::unpack_return

Browse Source
This commit is contained in:
frsyuki 2009-02-25 18:55:56 +09:00
parent bdd13859b6
commit a89dfc70b9
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cpp/pack.hpp
View File

@ -30,6 +30,7 @@ template <typename Stream>
class packer {
public:
packer(Stream& s);
~packer();
public:
template <typename T>
@ -129,6 +130,9 @@ private:
template <typename Stream>
packer<Stream>::packer(Stream& s) : m_stream(s) { }
template <typename Stream>
packer<Stream>::~packer() { }
template <typename Stream>
inline packer<Stream>& packer<Stream>::pack_uint8(uint8_t d)
{ _pack_uint8(m_stream, d); return *this; }

16
cpp/unpack.hpp
View File

@ -128,10 +128,10 @@ private:
typedef enum {
MSGPACK_UNPACK_SUCCESS = 2,
MSGPACK_UNPACK_EXTRA_BYTES = 1,
MSGPACK_UNPACK_CONTINUE = 0,
MSGPACK_UNPACK_PARSE_ERROR = -1,
UNPACK_SUCCESS = 2,
UNPACK_EXTRA_BYTES = 1,
UNPACK_CONTINUE = 0,
UNPACK_PARSE_ERROR = -1,
} unpack_return;
static unpack_return unpack(const char* data, size_t len, size_t* off,
@ -249,20 +249,20 @@ inline object unpack(const char* data, size_t len, zone& z, size_t* off)
object result;
switch( msgpack::unpack(data, len, off, &z, &result) ) {
case MSGPACK_UNPACK_SUCCESS:
case UNPACK_SUCCESS:
return result;
case MSGPACK_UNPACK_EXTRA_BYTES:
case UNPACK_EXTRA_BYTES:
if(off) {
return result;
} else {
throw unpack_error("extra bytes");
}
case MSGPACK_UNPACK_CONTINUE:
case UNPACK_CONTINUE:
throw unpack_error("insufficient bytes");
case MSGPACK_UNPACK_PARSE_ERROR:
case UNPACK_PARSE_ERROR:
default:
throw unpack_error("parse error");
}

7
example/stream.cc
View File

@ -113,6 +113,7 @@ int main(void)
// client thread:
fwriter writer(pair[1]);
msgpack::packer<fwriter> pk(writer);
typedef msgpack::type::tuple<std::string, std::string, std::string> put_t;
typedef msgpack::type::tuple<std::string, std::string> get_t;
@ -120,9 +121,9 @@ int main(void)
put_t req1("put", "apple", "red");
put_t req2("put", "lemon", "yellow");
get_t req3("get", "apple");
msgpack::pack(writer, req1);
msgpack::pack(writer, req2);
msgpack::pack(writer, req3);
pk.pack(req1);
pk.pack(req2);
pk.pack(req3);
writer.flush();
writer.close();