script_core 0.1.1 → 0.2.0

data/ext/enterprise_script_service/msgpack/include/msgpack/v2/x3_parse.hpp

@@ -22,6 +22,7 @@
 #if __GNUC__ >= 4
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wconversion"
 #endif // __GNUC__ >= 4
 
 #include <boost/config/warning_disable.hpp>
@@ -202,7 +203,7 @@ const auto mp_object_def =
         (
             [](auto& ctx){
                 auto& app_specific = x3::get<tag_app_specific>(ctx).get();
-                std::int8_t val = _attr(ctx);
+                std::int8_t val = static_cast<std::int8_t>(_attr(ctx));
                 app_specific.vis.visit_negative_integer(val);
             }
         )
@@ -253,7 +254,7 @@ const auto mp_object_def =
         (
             [](auto& ctx){
                 auto& app_specific = x3::get<tag_app_specific>(ctx).get();
-                std::int8_t val = _attr(ctx);
+                std::int8_t val = static_cast<std::int8_t>(_attr(ctx));
                 app_specific.vis.visit_negative_integer(val);
             }
         )
@@ -264,7 +265,7 @@ const auto mp_object_def =
         (
             [](auto& ctx){
                 auto& app_specific = x3::get<tag_app_specific>(ctx).get();
-                std::int16_t val = _attr(ctx);
+                std::int16_t val = static_cast<std::int16_t>(_attr(ctx));
                 app_specific.vis.visit_negative_integer(val);
             }
         )
@@ -275,7 +276,7 @@ const auto mp_object_def =
         (
             [](auto& ctx){
                 auto& app_specific = x3::get<tag_app_specific>(ctx).get();
-                std::int32_t val = _attr(ctx);
+                std::int32_t val = static_cast<std::int32_t>(_attr(ctx));
                 app_specific.vis.visit_negative_integer(val);
             }
         )
@@ -286,7 +287,7 @@ const auto mp_object_def =
         (
             [](auto& ctx){
                 auto& app_specific = x3::get<tag_app_specific>(ctx).get();
-                std::int64_t val = _attr(ctx);
+                std::int64_t val = static_cast<std::int64_t>(_attr(ctx));
                 app_specific.vis.visit_negative_integer(val);
             }
         )
@@ -339,7 +340,7 @@ const auto mp_object_def =
             [](auto& ctx){
                 auto& app_specific = x3::get<tag_app_specific>(ctx).get();
                 auto const& str = _attr(ctx);
-                std::size_t size = std::distance(str.begin(), str.end());
+                auto size = static_cast<uint32_t>(std::distance(str.begin(), str.end()));
                 app_specific.vis.visit_str(size ? &str.front() : nullptr, size);
             }
         )
@@ -363,7 +364,7 @@ const auto mp_object_def =
             [](auto& ctx){
                 auto& app_specific = x3::get<tag_app_specific>(ctx).get();
                 auto const& str = _attr(ctx);
-                std::size_t size = std::distance(str.begin(), str.end());
+                auto size = static_cast<uint32_t>(std::distance(str.begin(), str.end()));
                 app_specific.vis.visit_str(size ? &str.front() : nullptr, size);
             }
         )
@@ -387,7 +388,7 @@ const auto mp_object_def =
             [](auto& ctx){
                 auto& app_specific = x3::get<tag_app_specific>(ctx).get();
                 auto const& str = _attr(ctx);
-                std::size_t size = std::distance(str.begin(), str.end());
+                auto size = static_cast<uint32_t>(std::distance(str.begin(), str.end()));
                 app_specific.vis.visit_str(size ? &str.front() : nullptr, size);
             }
         )
@@ -411,7 +412,7 @@ const auto mp_object_def =
             [](auto& ctx){
                 auto& app_specific = x3::get<tag_app_specific>(ctx).get();
                 auto const& str = _attr(ctx);
-                std::size_t size = std::distance(str.begin(), str.end());
+                auto size = static_cast<uint32_t>(std::distance(str.begin(), str.end()));
                 app_specific.vis.visit_str(size ? &str.front() : nullptr, size);
             }
         )
@@ -435,7 +436,7 @@ const auto mp_object_def =
             [](auto& ctx){
                 auto& app_specific = x3::get<tag_app_specific>(ctx).get();
                 auto const& bin = _attr(ctx);
-                std::size_t size = std::distance(bin.begin(), bin.end());
+                auto size = static_cast<uint32_t>(std::distance(bin.begin(), bin.end()));
                 app_specific.vis.visit_bin(size ? &bin.front() : nullptr, size);
             }
         )
@@ -459,7 +460,7 @@ const auto mp_object_def =
             [](auto& ctx){
                 auto& app_specific = x3::get<tag_app_specific>(ctx).get();
                 auto const& bin = _attr(ctx);
-                std::size_t size = std::distance(bin.begin(), bin.end());
+                auto size = static_cast<uint32_t>(std::distance(bin.begin(), bin.end()));
                 app_specific.vis.visit_bin(size ? &bin.front() : nullptr, size);
             }
         )
@@ -483,7 +484,7 @@ const auto mp_object_def =
             [](auto& ctx){
                 auto& app_specific = x3::get<tag_app_specific>(ctx).get();
                 auto const& bin = _attr(ctx);
-                std::size_t size = std::distance(bin.begin(), bin.end());
+                auto size = static_cast<uint32_t>(std::distance(bin.begin(), bin.end()));
                 app_specific.vis.visit_bin(size ? &bin.front() : nullptr, size);
             }
         )
@@ -494,7 +495,7 @@ const auto mp_object_def =
         (
             [](auto& ctx){
                 auto& app_specific = x3::get<tag_app_specific>(ctx).get();
-                std::size_t size = _attr(ctx) & 0b00001111;
+                uint32_t size = _attr(ctx) & 0b00001111;
                 app_specific.index_sizes.emplace_back(size, index_size::type_t::array);
                 app_specific.vis.start_array(size);
             }
@@ -508,7 +509,7 @@ const auto mp_object_def =
         (
             [](auto& ctx){
                 auto& app_specific = x3::get<tag_app_specific>(ctx).get();
-                std::size_t size = _attr(ctx);
+                uint32_t size = _attr(ctx);
                 app_specific.index_sizes.emplace_back(size, index_size::type_t::array);
                 app_specific.vis.start_array(size);
             }
@@ -522,7 +523,7 @@ const auto mp_object_def =
         (
             [](auto& ctx){
                 auto& app_specific = x3::get<tag_app_specific>(ctx).get();
-                std::size_t size = _attr(ctx);
+                uint32_t size = _attr(ctx);
                 app_specific.index_sizes.emplace_back(size, index_size::type_t::array);
                 app_specific.vis.start_array(size);
             }
@@ -536,7 +537,7 @@ const auto mp_object_def =
         (
             [](auto& ctx){
                 auto& app_specific = x3::get<tag_app_specific>(ctx).get();
-                std::size_t size = _attr(ctx) & 0b00001111;
+                uint32_t size = _attr(ctx) & 0b00001111;
                 app_specific.index_sizes.emplace_back(size, index_size::type_t::map);
                 app_specific.vis.start_map(size);
             }
@@ -550,7 +551,7 @@ const auto mp_object_def =
         (
             [](auto& ctx){
                 auto& app_specific = x3::get<tag_app_specific>(ctx).get();
-                std::size_t size = _attr(ctx);
+                uint32_t size = _attr(ctx);
                 app_specific.index_sizes.emplace_back(size, index_size::type_t::map);
                 app_specific.vis.start_map(size);
             }
@@ -564,7 +565,7 @@ const auto mp_object_def =
         (
             [](auto& ctx){
                 auto& app_specific = x3::get<tag_app_specific>(ctx).get();
-                std::size_t size = _attr(ctx);
+                uint32_t size = _attr(ctx);
                 app_specific.index_sizes.emplace_back(size, index_size::type_t::map);
                 app_specific.vis.start_map(size);
             }
@@ -591,7 +592,7 @@ const auto mp_object_def =
             [](auto& ctx){
                 auto& app_specific = x3::get<tag_app_specific>(ctx).get();
                 auto const& ext = _attr(ctx);
-                std::size_t size = std::distance(ext.begin(), ext.end());
+                auto size = static_cast<uint32_t>(std::distance(ext.begin(), ext.end()));
                 app_specific.vis.visit_ext(size ? &ext.front() : nullptr, size);
             }
         )
@@ -615,7 +616,7 @@ const auto mp_object_def =
             [](auto& ctx){
                 auto& app_specific = x3::get<tag_app_specific>(ctx).get();
                 auto const& ext = _attr(ctx);
-                std::size_t size = std::distance(ext.begin(), ext.end());
+                auto size = static_cast<uint32_t>(std::distance(ext.begin(), ext.end()));
                 app_specific.vis.visit_ext(size ? &ext.front() : nullptr, size);
             }
         )
@@ -639,7 +640,7 @@ const auto mp_object_def =
             [](auto& ctx){
                 auto& app_specific = x3::get<tag_app_specific>(ctx).get();
                 auto const& ext = _attr(ctx);
-                std::size_t size = std::distance(ext.begin(), ext.end());
+                auto size = static_cast<uint32_t>(std::distance(ext.begin(), ext.end()));
                 app_specific.vis.visit_ext(size ? &ext.front() : nullptr, size);
             }
         )
@@ -663,7 +664,7 @@ const auto mp_object_def =
             [](auto& ctx){
                 auto& app_specific = x3::get<tag_app_specific>(ctx).get();
                 auto const& ext = _attr(ctx);
-                std::size_t size = std::distance(ext.begin(), ext.end());
+                auto size = static_cast<uint32_t>(std::distance(ext.begin(), ext.end()));
                 app_specific.vis.visit_ext(size ? &ext.front() : nullptr, size);
             }
         )
@@ -687,7 +688,7 @@ const auto mp_object_def =
             [](auto& ctx){
                 auto& app_specific = x3::get<tag_app_specific>(ctx).get();
                 auto const& ext = _attr(ctx);
-                std::size_t size = std::distance(ext.begin(), ext.end());
+                auto size = static_cast<uint32_t>(std::distance(ext.begin(), ext.end()));
                 app_specific.vis.visit_ext(size ? &ext.front() : nullptr, size);
             }
         )
@@ -711,7 +712,7 @@ const auto mp_object_def =
             [](auto& ctx){
                 auto& app_specific = x3::get<tag_app_specific>(ctx).get();
                 auto const& ext = _attr(ctx);
-                std::size_t size = std::distance(ext.begin(), ext.end());
+                auto size = static_cast<uint32_t>(std::distance(ext.begin(), ext.end()));
                 app_specific.vis.visit_ext(size ? &ext.front() : nullptr, size);
             }
         )
@@ -735,7 +736,7 @@ const auto mp_object_def =
             [](auto& ctx){
                 auto& app_specific = x3::get<tag_app_specific>(ctx).get();
                 auto const& ext = _attr(ctx);
-                std::size_t size = std::distance(ext.begin(), ext.end());
+                auto size = static_cast<uint32_t>(std::distance(ext.begin(), ext.end()));
                 app_specific.vis.visit_ext(size ? &ext.front() : nullptr, size);
             }
         )
@@ -759,7 +760,7 @@ const auto mp_object_def =
             [](auto& ctx){
                 auto& app_specific = x3::get<tag_app_specific>(ctx).get();
                 auto const& ext = _attr(ctx);
-                std::size_t size = std::distance(ext.begin(), ext.end());
+                auto size = static_cast<uint32_t>(std::distance(ext.begin(), ext.end()));
                 app_specific.vis.visit_ext(size ? &ext.front() : nullptr, size);
             }
         )
@@ -771,6 +772,7 @@ const auto array_item_def =
             [](auto& ctx){
                 auto& app_specific = x3::get<tag_app_specific>(ctx).get();
                 app_specific.vis.start_array_item();
+
                 _pass(ctx) = true;
             }
         )

data/ext/enterprise_script_service/msgpack/include/msgpack/v3/adaptor/int_decl.hpp

@@ -30,7 +30,7 @@ struct is_signed;
 
 
 template <bool Signed>
-struct object_char_sign;
+struct object_sign;
 
 //using v2::type::detail::convert_integer_sign;
 

data/ext/enterprise_script_service/msgpack/include/msgpack/v3/parse.hpp

@@ -63,29 +63,29 @@ private:
         load<T>(size, load_pos);
         if (size == 0) {
             if (!sv(size)) {
-                off = m_current - m_start;
+                off = static_cast<std::size_t>(m_current - m_start);
                 return PARSE_STOP_VISITOR;
             }
             if (!ev()) {
-                off = m_current - m_start;
+                off = static_cast<std::size_t>(m_current - m_start);
                 return PARSE_STOP_VISITOR;
             }
             parse_return ret = m_stack.consume(holder(), m_current);
             ++m_current;
             if (ret != PARSE_CONTINUE) {
-                off = m_current - m_start;
+                off = static_cast<std::size_t>(m_current - m_start);
                 return ret;
             }
         }
         else {
             if (!sv(size)) {
-                off = m_current - m_start;
+                off = static_cast<std::size_t>(m_current - m_start);
                 return PARSE_STOP_VISITOR;
             }
             parse_return ret = m_stack.push(holder(), sv.type(), static_cast<uint32_t>(size));
             ++m_current;
             if (ret != PARSE_CONTINUE) {
-                off = m_current - m_start;
+                off = static_cast<std::size_t>(m_current - m_start);
                 return ret;
             }
         }
@@ -95,13 +95,13 @@ private:
 
     parse_return after_visit_proc(bool visit_result, std::size_t& off) {
         if (!visit_result) {
-            off = m_current - m_start;
+            off = static_cast<std::size_t>(m_current - m_start);
             return PARSE_STOP_VISITOR;
         }
         parse_return ret = m_stack.consume(holder(), m_current);
         ++m_current;
         if (ret != PARSE_CONTINUE) {
-            off = m_current - m_start;
+            off = static_cast<std::size_t>(m_current - m_start);
         }
         m_cs = MSGPACK_CS_HEADER;
         return ret;
@@ -253,7 +253,7 @@ inline parse_return context<VisitorHolder>::execute(const char* data, std::size_
     msgpack::object obj;
 
     if(m_current == pe) {
-        off = m_current - m_start;
+        off = static_cast<std::size_t>(m_current - m_start);
         return PARSE_CONTINUE;
     }
     bool fixed_trail_again = false;
@@ -335,7 +335,7 @@ inline parse_return context<VisitorHolder>::execute(const char* data, std::size_
                 parse_return upr = after_visit_proc(visret, off);
                 if (upr != PARSE_CONTINUE) return upr;
             } else {
-                off = m_current - m_start;
+                off = static_cast<std::size_t>(m_current - m_start);
                 holder().visitor().parse_error(off - 1, off);
                 return PARSE_PARSE_ERROR;
             }
@@ -347,7 +347,7 @@ inline parse_return context<VisitorHolder>::execute(const char* data, std::size_
                 fixed_trail_again = false;
             }
             if(static_cast<std::size_t>(pe - m_current) < m_trail) {
-                off = m_current - m_start;
+                off = static_cast<std::size_t>(m_current - m_start);
                 return PARSE_CONTINUE;
             }
             n = m_current;
@@ -617,14 +617,14 @@ inline parse_return context<VisitorHolder>::execute(const char* data, std::size_
                 if (ret != PARSE_CONTINUE) return ret;
             } break;
             default:
-                off = m_current - m_start;
-                holder().visitor().parse_error(n - m_start - 1, n - m_start);
+                off = static_cast<std::size_t>(m_current - m_start);
+                holder().visitor().parse_error(static_cast<std::size_t>(n - m_start - 1), static_cast<std::size_t>(n - m_start));
                 return PARSE_PARSE_ERROR;
             }
         }
     } while(m_current != pe);
 
-    off = m_current - m_start;
+    off = static_cast<std::size_t>(m_current - m_start);
     return PARSE_CONTINUE;
 }
 

data/ext/enterprise_script_service/msgpack/include/msgpack/version_master.h

@@ -1,3 +1,3 @@
 #define MSGPACK_VERSION_MAJOR    3
-#define MSGPACK_VERSION_MINOR    1
-#define MSGPACK_VERSION_REVISION 1
+#define MSGPACK_VERSION_MINOR    2
+#define MSGPACK_VERSION_REVISION 0

data/ext/enterprise_script_service/msgpack/include/msgpack/zbuffer.h

@@ -100,8 +100,9 @@ static inline void msgpack_zbuffer_free(msgpack_zbuffer* zbuf)
 
 static inline bool msgpack_zbuffer_expand(msgpack_zbuffer* zbuf)
 {
-    size_t used = (char*)zbuf->stream.next_out - zbuf->data;
+    size_t used = static_cast<size_t>(reinterpret_cast<char*>(zbuf->stream.next_out) - zbuf->data);
     size_t csize = used + zbuf->stream.avail_out;
+
     size_t nsize = (csize == 0) ? zbuf->init_size : csize * 2;
 
     char* tmp = (char*)realloc(zbuf->data, nsize);
@@ -111,7 +112,7 @@ static inline bool msgpack_zbuffer_expand(msgpack_zbuffer* zbuf)
 
     zbuf->data = tmp;
     zbuf->stream.next_out  = (Bytef*)(tmp + used);
-    zbuf->stream.avail_out = nsize - used;
+    zbuf->stream.avail_out = static_cast<uInt>(nsize - used);
 
     return true;
 }
@@ -121,7 +122,7 @@ static inline int msgpack_zbuffer_write(void* data, const char* buf, size_t len)
     msgpack_zbuffer* zbuf = (msgpack_zbuffer*)data;
 
     zbuf->stream.next_in = (Bytef*)buf;
-    zbuf->stream.avail_in = len;
+    zbuf->stream.avail_in = static_cast<uInt>(len);
 
     while(zbuf->stream.avail_in > 0) {
         if(zbuf->stream.avail_out < MSGPACK_ZBUFFER_RESERVE_SIZE) {
@@ -162,12 +163,12 @@ static inline const char* msgpack_zbuffer_data(const msgpack_zbuffer* zbuf)
 
 static inline size_t msgpack_zbuffer_size(const msgpack_zbuffer* zbuf)
 {
-    return (char*)zbuf->stream.next_out - zbuf->data;
+    return static_cast<size_t>(reinterpret_cast<char*>(zbuf->stream.next_out) - zbuf->data);
 }
 
 static inline void msgpack_zbuffer_reset_buffer(msgpack_zbuffer* zbuf)
 {
-    zbuf->stream.avail_out += (char*)zbuf->stream.next_out - zbuf->data;
+    zbuf->stream.avail_out += (uInt)((char*)zbuf->stream.next_out - zbuf->data);
     zbuf->stream.next_out = (Bytef*)zbuf->data;
 }
 
@@ -197,4 +198,3 @@ static inline char* msgpack_zbuffer_release_buffer(msgpack_zbuffer* zbuf)
 #endif
 
 #endif /* msgpack/zbuffer.h */
-

data/ext/enterprise_script_service/msgpack/include/msgpack/zone.h

@@ -111,7 +111,7 @@ static inline void* msgpack_zone_malloc(msgpack_zone* zone, size_t size)
                 zone->chunk_list.ptr + (MSGPACK_ZONE_ALIGN - 1)
             ) / MSGPACK_ZONE_ALIGN * MSGPACK_ZONE_ALIGN
         );
-    size_t adjusted_size = size + (aligned - zone->chunk_list.ptr);
+    size_t adjusted_size = size + (size_t)(aligned - zone->chunk_list.ptr);
     if(zone->chunk_list.free >= adjusted_size) {
         zone->chunk_list.free -= adjusted_size;
         zone->chunk_list.ptr  += adjusted_size;

data/ext/enterprise_script_service/msgpack/src/objectc.c

@@ -7,9 +7,15 @@
  *    (See accompanying file LICENSE_1_0.txt or copy at
  *    http://www.boost.org/LICENSE_1_0.txt)
  */
+#if defined(_KERNEL_MODE)
+#  undef  _NO_CRT_STDIO_INLINE
+#  define _NO_CRT_STDIO_INLINE
+#endif
+
 #include "msgpack/object.h"
 #include "msgpack/pack.h"
 #include <ctype.h>
+
 #include <stdio.h>
 #include <string.h>
 
@@ -25,6 +31,10 @@
 #include <inttypes.h>
 #endif
 
+#if defined(_KERNEL_MODE)
+#  undef  snprintf
+#  define snprintf _snprintf
+#endif
 
 int msgpack_pack_object(msgpack_packer* pk, msgpack_object d)
 {
@@ -115,6 +125,7 @@ int msgpack_pack_object(msgpack_packer* pk, msgpack_object d)
     }
 }
 
+#if !defined(_KERNEL_MODE)
 
 static void msgpack_object_bin_print(FILE* out, const char *ptr, size_t size)
 {
@@ -130,35 +141,6 @@ static void msgpack_object_bin_print(FILE* out, const char *ptr, size_t size)
     }
 }
 
-static int msgpack_object_bin_print_buffer(char *buffer, size_t buffer_size, const char *ptr, size_t size)
-{
-    size_t i;
-    char *aux_buffer = buffer;
-    size_t aux_buffer_size = buffer_size;
-    int ret;
-
-    for (i = 0; i < size; ++i) {
-        if (ptr[i] == '"') {
-            ret = snprintf(aux_buffer, aux_buffer_size, "\\\"");
-            aux_buffer = aux_buffer + ret;
-            aux_buffer_size = aux_buffer_size - ret;
-        } else if (isprint((unsigned char)ptr[i])) {
-            if (aux_buffer_size > 0) {
-                memcpy(aux_buffer, ptr + i, 1);
-                aux_buffer = aux_buffer + 1;
-                aux_buffer_size = aux_buffer_size - 1;
-            }
-        } else {
-            ret = snprintf(aux_buffer, aux_buffer_size, "\\x%02x", (unsigned char)ptr[i]);
-            aux_buffer = aux_buffer + ret;
-            aux_buffer_size = aux_buffer_size - ret;
-        }
-    }
-
-    return buffer_size - aux_buffer_size;
-}
-
-
 void msgpack_object_print(FILE* out, msgpack_object o)
 {
     switch(o.type) {
@@ -270,6 +252,38 @@ void msgpack_object_print(FILE* out, msgpack_object o)
     }
 }
 
+#endif
+
+#define MSGPACK_CHECKED_CALL(ret, func, aux_buffer, aux_buffer_size, ...) \
+    ret = func(aux_buffer, aux_buffer_size, __VA_ARGS__);                 \
+    if (ret <= 0 || ret > (int)aux_buffer_size) return 0;                 \
+    aux_buffer = aux_buffer + ret;                                        \
+    aux_buffer_size = aux_buffer_size - ret                               \
+
+static int msgpack_object_bin_print_buffer(char *buffer, size_t buffer_size, const char *ptr, size_t size)
+{
+    size_t i;
+    char *aux_buffer = buffer;
+    size_t aux_buffer_size = buffer_size;
+    int ret;
+
+    for (i = 0; i < size; ++i) {
+        if (ptr[i] == '"') {
+            MSGPACK_CHECKED_CALL(ret, snprintf, aux_buffer, aux_buffer_size, "\\\"");
+        } else if (isprint((unsigned char)ptr[i])) {
+            if (aux_buffer_size > 0) {
+                memcpy(aux_buffer, ptr + i, 1);
+                aux_buffer = aux_buffer + 1;
+                aux_buffer_size = aux_buffer_size - 1;
+            }
+        } else {
+            MSGPACK_CHECKED_CALL(ret, snprintf, aux_buffer, aux_buffer_size, "\\x%02x", (unsigned char)ptr[i]);
+        }
+    }
+
+    return (int)(buffer_size - aux_buffer_size);
+}
+
 int msgpack_object_print_buffer(char *buffer, size_t buffer_size, msgpack_object o)
 {
     char *aux_buffer = buffer;
@@ -277,197 +291,118 @@ int msgpack_object_print_buffer(char *buffer, size_t buffer_size, msgpack_object
     int ret;
     switch(o.type) {
     case MSGPACK_OBJECT_NIL:
-        ret = snprintf(aux_buffer, aux_buffer_size, "nil");
-        aux_buffer = aux_buffer + ret;
-        aux_buffer_size = aux_buffer_size - ret;
+        MSGPACK_CHECKED_CALL(ret, snprintf, aux_buffer, aux_buffer_size, "nil");
         break;
 
     case MSGPACK_OBJECT_BOOLEAN:
-        ret = snprintf(aux_buffer, aux_buffer_size, (o.via.boolean ? "true" : "false"));
-        aux_buffer = aux_buffer + ret;
-        aux_buffer_size = aux_buffer_size - ret;
+        MSGPACK_CHECKED_CALL(ret, snprintf, aux_buffer, aux_buffer_size, (o.via.boolean ? "true" : "false"));
         break;
 
     case MSGPACK_OBJECT_POSITIVE_INTEGER:
 #if defined(PRIu64)
-        ret = snprintf(aux_buffer, aux_buffer_size, "%" PRIu64, o.via.u64);
-        aux_buffer = aux_buffer + ret;
-        aux_buffer_size = aux_buffer_size - ret;
+        MSGPACK_CHECKED_CALL(ret, snprintf, aux_buffer, aux_buffer_size, "%" PRIu64, o.via.u64);
 #else
         if (o.via.u64 > ULONG_MAX) {
-            ret = snprintf(aux_buffer, aux_buffer_size, "over 4294967295");
-            aux_buffer = aux_buffer + ret;
-            aux_buffer_size = aux_buffer_size - ret;
+            MSGPACK_CHECKED_CALL(ret, snprintf, aux_buffer, aux_buffer_size, "over 4294967295");
         } else {
-            ret = snprintf(aux_buffer, aux_buffer_size, "%lu", (unsigned long)o.via.u64);
-            aux_buffer = aux_buffer + ret;
-            aux_buffer_size = aux_buffer_size - ret;
+            MSGPACK_CHECKED_CALL(ret, snprintf, aux_buffer, aux_buffer_size, "%lu", (unsigned long)o.via.u64);
         }
 #endif
         break;
 
     case MSGPACK_OBJECT_NEGATIVE_INTEGER:
 #if defined(PRIi64)
-        ret = snprintf(aux_buffer, aux_buffer_size, "%" PRIi64, o.via.i64);
-        aux_buffer = aux_buffer + ret;
-        aux_buffer_size = aux_buffer_size - ret;
+        MSGPACK_CHECKED_CALL(ret, snprintf, aux_buffer, aux_buffer_size, "%" PRIi64, o.via.i64);
 #else
         if (o.via.i64 > LONG_MAX) {
-            ret = snprintf(aux_buffer, aux_buffer_size, "over +2147483647");
-            aux_buffer = aux_buffer + ret;
-            aux_buffer_size = aux_buffer_size - ret;
+            MSGPACK_CHECKED_CALL(ret, snprintf, aux_buffer, aux_buffer_size, "over +2147483647");
         } else if (o.via.i64 < LONG_MIN) {
-            ret = snprintf(aux_buffer, aux_buffer_size, "under -2147483648");
-            aux_buffer = aux_buffer + ret;
-            aux_buffer_size = aux_buffer_size - ret;
+            MSGPACK_CHECKED_CALL(ret, snprintf, aux_buffer, aux_buffer_size, "under -2147483648");
         } else {
-            ret = snprintf(aux_buffer, aux_buffer_size, "%ld", (signed long)o.via.i64);
-            aux_buffer = aux_buffer + ret;
-            aux_buffer_size = aux_buffer_size - ret;
+            MSGPACK_CHECKED_CALL(ret, snprintf, aux_buffer, aux_buffer_size, "%ld", (signed long)o.via.i64);
         }
 #endif
         break;
 
     case MSGPACK_OBJECT_FLOAT32:
     case MSGPACK_OBJECT_FLOAT64:
-        ret = snprintf(aux_buffer, aux_buffer_size, "%f", o.via.f64);
-        aux_buffer = aux_buffer + ret;
-        aux_buffer_size = aux_buffer_size - ret;
+        MSGPACK_CHECKED_CALL(ret, snprintf, aux_buffer, aux_buffer_size, "%f", o.via.f64);
         break;
 
     case MSGPACK_OBJECT_STR:
-        ret = snprintf(aux_buffer, aux_buffer_size, "\"");
-        aux_buffer = aux_buffer + ret;
-        aux_buffer_size = aux_buffer_size - ret;
-        ret = snprintf(aux_buffer, aux_buffer_size, "%.*s", (int)o.via.str.size, o.via.str.ptr);
-        aux_buffer = aux_buffer + ret;
-        aux_buffer_size = aux_buffer_size - ret;
-        ret = snprintf(aux_buffer, aux_buffer_size, "\"");
-        aux_buffer = aux_buffer + ret;
-        aux_buffer_size = aux_buffer_size - ret;
+        MSGPACK_CHECKED_CALL(ret, snprintf, aux_buffer, aux_buffer_size, "\"");
+        MSGPACK_CHECKED_CALL(ret, snprintf, aux_buffer, aux_buffer_size, "%.*s", (int)o.via.str.size, o.via.str.ptr);
+        MSGPACK_CHECKED_CALL(ret, snprintf, aux_buffer, aux_buffer_size, "\"");
         break;
 
     case MSGPACK_OBJECT_BIN:
-        ret = snprintf(aux_buffer, aux_buffer_size, "\"");
-        aux_buffer = aux_buffer + ret;
-        aux_buffer_size = aux_buffer_size - ret;
-
-        ret = msgpack_object_bin_print_buffer(aux_buffer, aux_buffer_size, o.via.bin.ptr, o.via.bin.size);
-        aux_buffer = aux_buffer + ret;
-        aux_buffer_size = aux_buffer_size - ret;
-
-        ret = snprintf(aux_buffer, aux_buffer_size, "\"");
-        aux_buffer = aux_buffer + ret;
-        aux_buffer_size = aux_buffer_size - ret;
+        MSGPACK_CHECKED_CALL(ret, snprintf, aux_buffer, aux_buffer_size, "\"");
+        MSGPACK_CHECKED_CALL(ret, msgpack_object_bin_print_buffer, aux_buffer, aux_buffer_size, o.via.bin.ptr, o.via.bin.size);
+        MSGPACK_CHECKED_CALL(ret, snprintf, aux_buffer, aux_buffer_size, "\"");
         break;
 
     case MSGPACK_OBJECT_EXT:
 #if defined(PRIi8)
-        ret = snprintf(aux_buffer, aux_buffer_size, "(ext: %" PRIi8 ")", o.via.ext.type);
-        aux_buffer = aux_buffer + ret;
-        aux_buffer_size = aux_buffer_size - ret;
+        MSGPACK_CHECKED_CALL(ret, snprintf, aux_buffer, aux_buffer_size, "(ext: %" PRIi8 ")", o.via.ext.type);
 #else
-        ret = snprintf(aux_buffer, aux_buffer_size, "(ext: %d)", (int)o.via.ext.type);
-        aux_buffer = aux_buffer + ret;
-        aux_buffer_size = aux_buffer_size - ret;
+        MSGPACK_CHECKED_CALL(ret, snprintf, aux_buffer, aux_buffer_size, "(ext: %d)", (int)o.via.ext.type);
 #endif
-        ret = snprintf(aux_buffer, aux_buffer_size, "\"");
-        aux_buffer = aux_buffer + ret;
-        aux_buffer_size = aux_buffer_size - ret;
-
-        ret = msgpack_object_bin_print_buffer(aux_buffer, aux_buffer_size, o.via.ext.ptr, o.via.ext.size);
-        aux_buffer = aux_buffer + ret;
-        aux_buffer_size = aux_buffer_size - ret;
-
-        ret = snprintf(aux_buffer, aux_buffer_size, "\"");
-        aux_buffer = aux_buffer + ret;
-        aux_buffer_size = aux_buffer_size - ret;
+        MSGPACK_CHECKED_CALL(ret, snprintf, aux_buffer, aux_buffer_size, "\"");
+        MSGPACK_CHECKED_CALL(ret, msgpack_object_bin_print_buffer, aux_buffer, aux_buffer_size, o.via.ext.ptr, o.via.ext.size);
+        MSGPACK_CHECKED_CALL(ret, snprintf, aux_buffer, aux_buffer_size, "\"");
         break;
 
     case MSGPACK_OBJECT_ARRAY:
-        ret = snprintf(aux_buffer, aux_buffer_size, "[");
-        aux_buffer = aux_buffer + ret;
-        aux_buffer_size = aux_buffer_size - ret;
+        MSGPACK_CHECKED_CALL(ret, snprintf, aux_buffer, aux_buffer_size, "[");
         if(o.via.array.size != 0) {
             msgpack_object* p = o.via.array.ptr;
             msgpack_object* const pend = o.via.array.ptr + o.via.array.size;
-            ret = msgpack_object_print_buffer(aux_buffer, aux_buffer_size, *p);
-            aux_buffer = aux_buffer + ret;
-            aux_buffer_size = aux_buffer_size - ret;
+            MSGPACK_CHECKED_CALL(ret, msgpack_object_print_buffer, aux_buffer, aux_buffer_size, *p);
             ++p;
             for(; p < pend; ++p) {
-                ret = snprintf(aux_buffer, aux_buffer_size, ", ");
-                aux_buffer = aux_buffer + ret;
-                aux_buffer_size = aux_buffer_size - ret;
-                ret = msgpack_object_print_buffer(aux_buffer, aux_buffer_size, *p);
-                aux_buffer = aux_buffer + ret;
-                aux_buffer_size = aux_buffer_size - ret;
+                MSGPACK_CHECKED_CALL(ret, snprintf, aux_buffer, aux_buffer_size, ", ");
+                MSGPACK_CHECKED_CALL(ret, msgpack_object_print_buffer, aux_buffer, aux_buffer_size, *p);
             }
         }
-        ret = snprintf(aux_buffer, aux_buffer_size, "]");
-        aux_buffer = aux_buffer + ret;
-        aux_buffer_size = aux_buffer_size - ret;
+        MSGPACK_CHECKED_CALL(ret, snprintf, aux_buffer, aux_buffer_size, "]");
         break;
 
     case MSGPACK_OBJECT_MAP:
-        ret = snprintf(aux_buffer, aux_buffer_size, "{");
-        aux_buffer = aux_buffer + ret;
-        aux_buffer_size = aux_buffer_size - ret;
+        MSGPACK_CHECKED_CALL(ret, snprintf, aux_buffer, aux_buffer_size, "{");
         if(o.via.map.size != 0) {
             msgpack_object_kv* p = o.via.map.ptr;
             msgpack_object_kv* const pend = o.via.map.ptr + o.via.map.size;
-            ret = msgpack_object_print_buffer(aux_buffer, aux_buffer_size, p->key);
-            aux_buffer = aux_buffer + ret;
-            aux_buffer_size = aux_buffer_size - ret;
-            ret = snprintf(aux_buffer, aux_buffer_size, "=>");
-            aux_buffer = aux_buffer + ret;
-            aux_buffer_size = aux_buffer_size - ret;
-            ret = msgpack_object_print_buffer(aux_buffer, aux_buffer_size, p->val);
-            aux_buffer = aux_buffer + ret;
-            aux_buffer_size = aux_buffer_size - ret;
+            MSGPACK_CHECKED_CALL(ret, msgpack_object_print_buffer, aux_buffer, aux_buffer_size, p->key);
+            MSGPACK_CHECKED_CALL(ret, snprintf, aux_buffer, aux_buffer_size, "=>");
+            MSGPACK_CHECKED_CALL(ret, msgpack_object_print_buffer, aux_buffer, aux_buffer_size, p->val);
             ++p;
             for(; p < pend; ++p) {
-                ret = snprintf(aux_buffer, aux_buffer_size, ", ");
-                aux_buffer = aux_buffer + ret;
-                aux_buffer_size = aux_buffer_size - ret;
-                ret = msgpack_object_print_buffer(aux_buffer, aux_buffer_size, p->key);
-                aux_buffer = aux_buffer + ret;
-                aux_buffer_size = aux_buffer_size - ret;
-                ret = snprintf(aux_buffer, aux_buffer_size, "=>");
-                aux_buffer = aux_buffer + ret;
-                aux_buffer_size = aux_buffer_size - ret;
-                ret = msgpack_object_print_buffer(aux_buffer, aux_buffer_size, p->val);
-                aux_buffer = aux_buffer + ret;
-                aux_buffer_size = aux_buffer_size - ret;
+                MSGPACK_CHECKED_CALL(ret, snprintf, aux_buffer, aux_buffer_size, ", ");
+                MSGPACK_CHECKED_CALL(ret, msgpack_object_print_buffer, aux_buffer, aux_buffer_size, p->key);
+                MSGPACK_CHECKED_CALL(ret, snprintf, aux_buffer, aux_buffer_size, "=>");
+                MSGPACK_CHECKED_CALL(ret, msgpack_object_print_buffer, aux_buffer, aux_buffer_size, p->val);
             }
         }
-        ret = snprintf(aux_buffer, aux_buffer_size, "}");
-        aux_buffer = aux_buffer + ret;
-        aux_buffer_size = aux_buffer_size - ret;
+        MSGPACK_CHECKED_CALL(ret, snprintf, aux_buffer, aux_buffer_size, "}");
         break;
 
     default:
     // FIXME
 #if defined(PRIu64)
-        ret = snprintf(aux_buffer, aux_buffer_size, "#<UNKNOWN %i %" PRIu64 ">", o.type, o.via.u64);
-        aux_buffer = aux_buffer + ret;
-        aux_buffer_size = aux_buffer_size - ret;
+        MSGPACK_CHECKED_CALL(ret, snprintf, aux_buffer, aux_buffer_size, "#<UNKNOWN %i %" PRIu64 ">", o.type, o.via.u64);
 #else
         if (o.via.u64 > ULONG_MAX) {
-            ret = snprintf(aux_buffer, aux_buffer_size, "#<UNKNOWN %i over 4294967295>", o.type);
-            aux_buffer = aux_buffer + ret;
-            aux_buffer_size = aux_buffer_size - ret;
+            MSGPACK_CHECKED_CALL(ret, snprintf, aux_buffer, aux_buffer_size, "#<UNKNOWN %i over 4294967295>", o.type);
         } else {
-            ret = snprintf(aux_buffer, aux_buffer_size, "#<UNKNOWN %i %lu>", o.type, (unsigned long)o.via.u64);
-            aux_buffer = aux_buffer + ret;
-            aux_buffer_size = aux_buffer_size - ret;
+            MSGPACK_CHECKED_CALL(ret, snprintf, aux_buffer, aux_buffer_size, "#<UNKNOWN %i %lu>", o.type, (unsigned long)o.via.u64);
         }
 #endif
     }
 
-    return buffer_size - aux_buffer_size;
+    return (int)(buffer_size - aux_buffer_size);
 }
 
+#undef MSGPACK_CHECKED_CALL
 
 bool msgpack_object_equal(const msgpack_object x, const msgpack_object y)
 {