fix unpacker

2 files changed, 32 insertions, 36 deletions

diff --git a/cpp/sbuffer.hpp b/cpp/sbuffer.hpp
index 2651b58..ca06884e 100644
--- a/cpp/sbuffer.hpp
+++ b/cpp/sbuffer.hpp
@@ -28,78 +28,71 @@ class sbuffer : public msgpack_sbuffer {
 public:
 	sbuffer(size_t initsz = MSGPACK_SBUFFER_INIT_SIZE)
 	{
-		msgpack_sbuffer* sbuf = static_cast<msgpack_sbuffer*>(this);
-
-		sbuf->data = (char*)::malloc(initsz);
-		if(!sbuf->data) {
+		base::data = (char*)::malloc(initsz);
+		if(!base::data) {
 			throw std::bad_alloc();
 		}
 
-		sbuf->size = 0;
-		sbuf->alloc = initsz;
+		base::size = 0;
+		base::alloc = initsz;
 	}
 
 	~sbuffer()
 	{
-		msgpack_sbuffer* sbuf = static_cast<msgpack_sbuffer*>(this);
-		::free(sbuf->data);
+		::free(base::data);
 	}
 
 public:
 	void write(const char* buf, unsigned int len)
 	{
-		msgpack_sbuffer* sbuf = static_cast<msgpack_sbuffer*>(this);
-		if(sbuf->alloc - sbuf->size < len) {
+		if(base::alloc - base::size < len) {
 			expand_buffer(len);
 		}
-		memcpy(sbuf->data + sbuf->size, buf, len);
-		sbuf->size += len;
+		memcpy(base::data + base::size, buf, len);
+		base::size += len;
 	}
 
 	char* data()
 	{
-		msgpack_sbuffer* sbuf = static_cast<msgpack_sbuffer*>(this);
-		return sbuf->data;
+		return base::data;
 	}
 
 	const char* data() const
 	{
-		const msgpack_sbuffer* sbuf = static_cast<const msgpack_sbuffer*>(this);
-		return sbuf->data;
+		return base::data;
 	}
 
 	size_t size() const
 	{
-		const msgpack_sbuffer* sbuf = static_cast<const msgpack_sbuffer*>(this);
-		return sbuf->size;
+		return base::size;
 	}
 
 	char* release()
 	{
-		msgpack_sbuffer* sbuf = static_cast<msgpack_sbuffer*>(this);
-		return msgpack_sbuffer_release(sbuf);
+		return msgpack_sbuffer_release(this);
 	}
 
 private:
 	void expand_buffer(size_t len)
 	{
-		msgpack_sbuffer* sbuf = static_cast<msgpack_sbuffer*>(this);
-
-		size_t nsize = (sbuf->alloc) ?
-				sbuf->alloc * 2 : MSGPACK_SBUFFER_INIT_SIZE;
+		size_t nsize = (base::alloc) ?
+				base::alloc * 2 : MSGPACK_SBUFFER_INIT_SIZE;
 	
-		while(nsize < sbuf->size + len) { nsize *= 2; }
+		while(nsize < base::size + len) { nsize *= 2; }
 	
-		void* tmp = realloc(sbuf->data, nsize);
+		void* tmp = realloc(base::data, nsize);
 		if(!tmp) {
 			throw std::bad_alloc();
 		}
 	
-		sbuf->data = (char*)tmp;
-		sbuf->alloc = nsize;
+		base::data = (char*)tmp;
+		base::alloc = nsize;
 	}
 
 private:
+	typedef msgpack_sbuffer base;
+
+private:
 	sbuffer(const sbuffer&);
 };
 
diff --git a/cpp/unpack.hpp b/cpp/unpack.hpp
index e140b36..38ac7ac 100644
--- a/cpp/unpack.hpp
+++ b/cpp/unpack.hpp
@@ -39,7 +39,7 @@ struct unpack_error : public std::runtime_error {
 
 class unpacker : public msgpack_unpacker {
 public:
-	unpacker(size_t initial_buffer_size = MSGPACK_UNPACKER_DEFAULT_INITIAL_BUFFER_SIZE);
+	unpacker(size_t init_buffer_size = MSGPACK_UNPACKER_DEFAULT_INITIAL_BUFFER_SIZE);
 	~unpacker();
 
 public:
@@ -127,6 +127,9 @@ public:
 	void remove_nonparsed_buffer();
 
 private:
+	typedef msgpack_unpacker base;
+
+private:
 	unpacker(const unpacker&);
 };
 
@@ -207,9 +210,9 @@ inline zone* unpacker::release_zone()
 
 	zone* r = new zone();
 
-	msgpack_zone old = *this->z;
-	*this->z = *z;
-	*z = old;
+	msgpack_zone old = *base::z;
+	*base::z = *r;
+	*static_cast<msgpack_zone*>(r) = old;
 
 	return r;
 }
@@ -232,22 +235,22 @@ inline size_t unpacker::parsed_size() const
 
 inline char* unpacker::nonparsed_buffer()
 {
-	return buf + off;
+	return base::buffer + base::off;
 }
 
 inline size_t unpacker::nonparsed_size() const
 {
-	return used - off;
+	return base::used - base::off;
 }
 
 inline void unpacker::skip_nonparsed_buffer(size_t size)
 {
-	off += size;
+	base::off += size;
 }
 
 inline void unpacker::remove_nonparsed_buffer()
 {
-	used = off;
+	base::used = base::off;
 }