update pack/unpack routines

git-svn-id: file:///Users/frsyuki/project/msgpack-git/svn/x@100 5a5092ae-2292-43ba-b2d5-dcab9c1a2731
2025-10-13 22:50:19 +02:00 · 2009-02-15 09:10:02 +00:00
parent 81a771094d
commit a114f4a5a5
32 changed files with 503 additions and 366 deletions
--- a/c/COPYING
+++ b/c/COPYING
@@ -1,4 +1,4 @@
-Copyright (C) 2008 FURUHASHI Sadayuki
+Copyright (C) 2008-2009 FURUHASHI Sadayuki

   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
--- a/c/Makefile.am
+++ b/c/Makefile.am
@@ -1,13 +1,18 @@
 lib_LTLIBRARIES = libmsgpackc.la

 libmsgpackc_la_SOURCES = \
-		pack.c \
-		unpack.c
+		unpack.c \
+		object.c \
+		zone.c

 nobase_include_HEADERS = \
 		msgpack.h \
+		msgpack/sbuffer.h \
 		msgpack/pack.h \
-		msgpack/unpack.h
+		msgpack/unpack.h \
+		msgpack/object.h \
+		msgpack/zone.h

-libmsgpackc_la_LDFLAGS = -version-info 0:0:0
+# -version-info CURRENT:REVISION:AGE
+libmsgpackc_la_LDFLAGS = -version-info 1:0:0

--- a/c/README
+++ b/c/README
@@ -4,7 +4,7 @@ MessagePack is a binary-based efficient data interchange format.



-Copyright (C) 2008 FURUHASHI Sadayuki
+Copyright (C) 2008-2009 FURUHASHI Sadayuki

   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
--- a/c/msgpack.h
+++ b/c/msgpack.h
@@ -1,7 +1,7 @@
 /*
 * MessagePack for C
 *
- * Copyright (C) 2008 FURUHASHI Sadayuki
+ * Copyright (C) 2008-2009 FURUHASHI Sadayuki
 *
 *    Licensed under the Apache License, Version 2.0 (the "License");
 *    you may not use this file except in compliance with the License.
@@ -15,5 +15,8 @@
 *    See the License for the specific language governing permissions and
 *    limitations under the License.
 */
+#include "msgpack/object.h"
+#include "msgpack/zone.h"
 #include "msgpack/pack.h"
 #include "msgpack/unpack.h"
+#include "msgpack/sbuffer.h"
--- a/c/pack.c
+++ b/c/pack.c
@@ -1,49 +0,0 @@
-/*
- * MessagePack packing routine for C
- *
- * Copyright (C) 2008 FURUHASHI Sadayuki
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-#include "msgpack/pack.h"
-#include "msgpack/pack_define.h"
-#include <stdlib.h>
-
-
-#define msgpack_pack_inline_func(name) \
-	void msgpack_pack_##name
-
-#define msgpack_pack_inline_func_cint(name) \
-	void msgpack_pack_##name
-
-#define msgpack_pack_user msgpack_pack_t*
-
-#define msgpack_pack_append_buffer(user, buf, len) \
-	(*(user)->callback)((user)->data, (const char*)buf, len)
-
-#include "msgpack/pack_template.h"
-
-msgpack_pack_t* msgpack_pack_new(void* data, msgpack_pack_append_buffer_t callback)
-{
-	msgpack_pack_t* ctx = calloc(1, sizeof(msgpack_pack_t));
-	if(!ctx) { return NULL; }
-	ctx->data = data;
-	ctx->callback = callback;
-	return ctx;
-}
-
-void msgpack_pack_free(msgpack_pack_t* ctx)
-{
-	free(ctx);
-}
-
--- a/c/pack.h
+++ b/c/pack.h
@@ -1,7 +1,7 @@
 /*
- * MessagePack packing routine for C
+ * MessagePack for C packing routine
 *
- * Copyright (C) 2008 FURUHASHI Sadayuki
+ * Copyright (C) 2008-2009 FURUHASHI Sadayuki
 *
 *    Licensed under the Apache License, Version 2.0 (the "License");
 *    you may not use this file except in compliance with the License.
@@ -20,50 +20,90 @@

 #include <stddef.h>
 #include <stdint.h>
+#include <stdlib.h>

 #ifdef __cplusplus
 extern "C" {
 #endif


-typedef void (*msgpack_pack_append_buffer_t)(void* data, const char* b, unsigned int i);
+typedef int (*msgpack_pack_write_t)(void* data, const char* buf, unsigned int len);

 typedef struct {
 	void* data;
-	msgpack_pack_append_buffer_t callback;
+	msgpack_pack_write_t callback;
 } msgpack_pack_t;

-msgpack_pack_t* msgpack_pack_new(void* data, msgpack_pack_append_buffer_t callback);
+void msgpack_pack_init(msgpack_pack_t* ctx, void* data, msgpack_pack_write_t callback);

+msgpack_pack_t* msgpack_pack_new(void* data, msgpack_pack_write_t callback);
 void msgpack_pack_free(msgpack_pack_t* ctx);

-void msgpack_pack_int(msgpack_pack_t* ctx, int d);
-void msgpack_pack_unsigned_int(msgpack_pack_t* ctx, unsigned int d);
-void msgpack_pack_long(msgpack_pack_t* ctx, long d);
-void msgpack_pack_unsigned_long(msgpack_pack_t* ctx, unsigned long d);
+int msgpack_pack_short(msgpack_pack_t* ctx, short d);
+int msgpack_pack_int(msgpack_pack_t* ctx, int d);
+int msgpack_pack_long(msgpack_pack_t* ctx, long d);
+int msgpack_pack_long_long(msgpack_pack_t* ctx, long long d);
+int msgpack_pack_unsigned_short(msgpack_pack_t* ctx, unsigned short d);
+int msgpack_pack_unsigned_int(msgpack_pack_t* ctx, unsigned int d);
+int msgpack_pack_unsigned_long(msgpack_pack_t* ctx, unsigned long d);
+int msgpack_pack_unsigned_long_long(msgpack_pack_t* ctx, unsigned long long d);

-void msgpack_pack_uint8(msgpack_pack_t* ctx, uint8_t d);
-void msgpack_pack_uint16(msgpack_pack_t* ctx, uint16_t d);
-void msgpack_pack_uint32(msgpack_pack_t* ctx, uint32_t d);
-void msgpack_pack_uint64(msgpack_pack_t* ctx, uint64_t d);
-void msgpack_pack_int8(msgpack_pack_t* ctx, int8_t d);
-void msgpack_pack_int16(msgpack_pack_t* ctx, int16_t d);
-void msgpack_pack_int32(msgpack_pack_t* ctx, int32_t d);
-void msgpack_pack_int64(msgpack_pack_t* ctx, int64_t d);
+int msgpack_pack_uint8(msgpack_pack_t* ctx, uint8_t d);
+int msgpack_pack_uint16(msgpack_pack_t* ctx, uint16_t d);
+int msgpack_pack_uint32(msgpack_pack_t* ctx, uint32_t d);
+int msgpack_pack_uint64(msgpack_pack_t* ctx, uint64_t d);
+int msgpack_pack_int8(msgpack_pack_t* ctx, int8_t d);
+int msgpack_pack_int16(msgpack_pack_t* ctx, int16_t d);
+int msgpack_pack_int32(msgpack_pack_t* ctx, int32_t d);
+int msgpack_pack_int64(msgpack_pack_t* ctx, int64_t d);

-void msgpack_pack_float(msgpack_pack_t* ctx, float d);
-void msgpack_pack_double(msgpack_pack_t* ctx, double d);
+int msgpack_pack_float(msgpack_pack_t* ctx, float d);
+int msgpack_pack_double(msgpack_pack_t* ctx, double d);

-void msgpack_pack_nil(msgpack_pack_t* ctx);
-void msgpack_pack_true(msgpack_pack_t* ctx);
-void msgpack_pack_false(msgpack_pack_t* ctx);
+int msgpack_pack_nil(msgpack_pack_t* ctx);
+int msgpack_pack_true(msgpack_pack_t* ctx);
+int msgpack_pack_false(msgpack_pack_t* ctx);

-void msgpack_pack_array(msgpack_pack_t* ctx, unsigned int n);
+int msgpack_pack_array(msgpack_pack_t* ctx, unsigned int n);

-void msgpack_pack_map(msgpack_pack_t* ctx, unsigned int n);
+int msgpack_pack_map(msgpack_pack_t* ctx, unsigned int n);

-void msgpack_pack_raw(msgpack_pack_t* ctx, size_t l);
-void msgpack_pack_raw_body(msgpack_pack_t* ctx, const void* b, size_t l);
+int msgpack_pack_raw(msgpack_pack_t* ctx, size_t l);
+int msgpack_pack_raw_body(msgpack_pack_t* ctx, const void* b, size_t l);
+
+
+
+#define msgpack_pack_inline_func(name) \
+	inline int msgpack_pack ## name
+
+#define msgpack_pack_inline_func_cint(name) \
+	inline int msgpack_pack ## name
+
+#define msgpack_pack_user msgpack_pack_t*
+
+#define msgpack_pack_append_buffer(user, buf, len) \
+	return (*(user)->callback)((user)->data, (const char*)buf, len)
+
+#include "msgpack/pack_template.h"
+
+inline void msgpack_pack_init(msgpack_pack_t* ctx, void* data, msgpack_pack_write_t callback)
+{
+	ctx->data = data;
+	ctx->callback = callback;
+}
+
+inline msgpack_pack_t* msgpack_pack_new(void* data, msgpack_pack_write_t callback)
+{
+	msgpack_pack_t* ctx = (msgpack_pack_t*)calloc(1, sizeof(msgpack_pack_t));
+	if(!ctx) { return NULL; }
+	msgpack_pack_init(ctx, data, callback);
+	return ctx;
+}
+
+inline void msgpack_pack_free(msgpack_pack_t* ctx)
+{
+	free(ctx);
+}


 #ifdef __cplusplus
--- a/c/unpack.c
+++ b/c/unpack.c
@@ -1,7 +1,7 @@
 /*
- * MessagePack unpacking routine for C
+ * MessagePack for C unpacking routine
 *
- * Copyright (C) 2008 FURUHASHI Sadayuki
+ * Copyright (C) 2008-2009 FURUHASHI Sadayuki
 *
 *    Licensed under the Apache License, Version 2.0 (the "License");
 *    you may not use this file except in compliance with the License.
@@ -21,13 +21,13 @@


 #define msgpack_unpack_struct(name) \
-	struct template_##name
+	struct template ## name

 #define msgpack_unpack_func(ret, name) \
-	ret template_func_##name
+	ret template_func ## name

 #define msgpack_unpack_callback(name) \
-	template_callback_##name
+	template_callback ## name

 #define msgpack_unpack_object void*

--- a/c/unpack.h
+++ b/c/unpack.h
@@ -1,7 +1,7 @@
 /*
- * MessagePack unpacking routine for C
+ * MessagePack for C unpacking routine
 *
- * Copyright (C) 2008 FURUHASHI Sadayuki
+ * Copyright (C) 2008-2009 FURUHASHI Sadayuki
 *
 *    Licensed under the Apache License, Version 2.0 (the "License");
 *    you may not use this file except in compliance with the License.
@@ -54,11 +54,11 @@ typedef struct {

 msgpack_unpack_t* msgpack_unpack_new(void* data, msgpack_unpack_callback* callback);
 void msgpack_unpack_free(msgpack_unpack_t* ctx);
-void msgpack_unpack_reset(msgpack_unpack_t* ctx);

 int msgpack_unpack_execute(msgpack_unpack_t* ctx,
 		const char* data, size_t len, size_t* off);
 void* msgpack_unpack_data(msgpack_unpack_t* ctx);
+void msgpack_unpack_reset(msgpack_unpack_t* ctx);


 #ifdef __cplusplus