generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-05-02 23:42:31 +02:00
Code Issues Projects Releases Wiki Activity

Fix compilation warnings about possible loss of data

Browse Source
This commit is contained in:
raeraex2 2017-01-17 22:16:05 +01:00
parent a933fa5892
commit b7543e1386
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/msgpack/v1/adaptor/carray.hpp
View File

@ -101,7 +101,7 @@ struct pack<char[N]> {
char const* p = v; char const* p = v;
uint32_t size = checked_get_container_size(N); uint32_t size = checked_get_container_size(N);
char const* p2 = static_cast<char const*>(std::memchr(p, '\0', size)); char const* p2 = static_cast<char const*>(std::memchr(p, '\0', size));
uint32_t adjusted_size = p2 ? p2 - p : size; uint32_t adjusted_size = p2 ? static_cast<uint32_t>(p2 - p) : size;
o.pack_str(adjusted_size); o.pack_str(adjusted_size);
o.pack_str_body(p, adjusted_size); o.pack_str_body(p, adjusted_size);
return o; return o;
@ -115,7 +115,7 @@ struct pack<const char[N]> {
uint32_t size = checked_get_container_size(N); uint32_t size = checked_get_container_size(N);
char const* p = v; char const* p = v;
char const* p2 = static_cast<char const*>(std::memchr(p, '\0', size)); char const* p2 = static_cast<char const*>(std::memchr(p, '\0', size));
uint32_t adjusted_size = p2 ? p2 - p : size; uint32_t adjusted_size = p2 ? static_cast<uint32_t>(p2 - p) : size;
o.pack_str(adjusted_size); o.pack_str(adjusted_size);
o.pack_str_body(p, adjusted_size); o.pack_str_body(p, adjusted_size);
return o; return o;
@ -167,7 +167,7 @@ struct object_with_zone<char[N]> {
char const* p = v; char const* p = v;
uint32_t size = checked_get_container_size(N); uint32_t size = checked_get_container_size(N);
char const* p2 = static_cast<char const*>(std::memchr(p, '\0', size)); char const* p2 = static_cast<char const*>(std::memchr(p, '\0', size));
uint32_t adjusted_size = p2 ? p2 - p : size; uint32_t adjusted_size = p2 ? static_cast<uint32_t>(p2 - p) : size;
o.type = msgpack::type::STR; o.type = msgpack::type::STR;
char* ptr = static_cast<char*>(o.zone.allocate_align(adjusted_size)); char* ptr = static_cast<char*>(o.zone.allocate_align(adjusted_size));
o.via.str.ptr = ptr; o.via.str.ptr = ptr;
@ -182,7 +182,7 @@ struct object_with_zone<const char[N]> {
char const* p = v; char const* p = v;
uint32_t size = checked_get_container_size(N); uint32_t size = checked_get_container_size(N);
char const* p2 = static_cast<char const*>(std::memchr(p, '\0', size)); char const* p2 = static_cast<char const*>(std::memchr(p, '\0', size));
uint32_t adjusted_size = p2 ? p2 - p : size; uint32_t adjusted_size = p2 ? static_cast<uint32_t>(p2 - p) : size;
o.type = msgpack::type::STR; o.type = msgpack::type::STR;
char* ptr = static_cast<char*>(o.zone.allocate_align(adjusted_size)); char* ptr = static_cast<char*>(o.zone.allocate_align(adjusted_size));
o.via.str.ptr = ptr; o.via.str.ptr = ptr;
@ -221,7 +221,7 @@ struct object<char[N]> {
char const* p = v; char const* p = v;
uint32_t size = checked_get_container_size(N); uint32_t size = checked_get_container_size(N);
char const* p2 = static_cast<char const*>(std::memchr(p, '\0', size)); char const* p2 = static_cast<char const*>(std::memchr(p, '\0', size));
uint32_t adjusted_size = p2 ? p2 - p : size; uint32_t adjusted_size = p2 ? static_cast<uint32_t>(p2 - p) : size;
o.type = msgpack::type::STR; o.type = msgpack::type::STR;
o.via.str.ptr = p; o.via.str.ptr = p;
o.via.str.size = adjusted_size; o.via.str.size = adjusted_size;
@ -234,7 +234,7 @@ struct object<const char[N]> {
char const* p = v; char const* p = v;
uint32_t size = checked_get_container_size(N); uint32_t size = checked_get_container_size(N);
char const* p2 = static_cast<char const*>(std::memchr(p, '\0', size)); char const* p2 = static_cast<char const*>(std::memchr(p, '\0', size));
uint32_t adjusted_size = p2 ? p2 - p : size; uint32_t adjusted_size = p2 ? static_cast<uint32_t>(p2 - p) : size;
o.type = msgpack::type::STR; o.type = msgpack::type::STR;
o.via.str.ptr = p; o.via.str.ptr = p;
o.via.str.size = adjusted_size; o.via.str.size = adjusted_size;

10
include/msgpack/v2/parse.hpp
View File

@ -459,7 +459,7 @@ inline parse_return context<VisitorHolder>::execute(const char* data, std::size_
load<uint8_t>(tmp, n); load<uint8_t>(tmp, n);
m_trail = tmp + 1; m_trail = tmp + 1;
if(m_trail == 0) { if(m_trail == 0) {
bool visret = holder().visitor().visit_ext(n, m_trail); bool visret = holder().visitor().visit_ext(n, static_cast<uint32_t>(m_trail));
parse_return upr = after_visit_proc(visret, off); parse_return upr = after_visit_proc(visret, off);
if (upr != PARSE_CONTINUE) return upr; if (upr != PARSE_CONTINUE) return upr;
} }
@ -501,7 +501,7 @@ inline parse_return context<VisitorHolder>::execute(const char* data, std::size_
load<uint16_t>(tmp, n); load<uint16_t>(tmp, n);
m_trail = tmp + 1; m_trail = tmp + 1;
if(m_trail == 0) { if(m_trail == 0) {
bool visret = holder().visitor().visit_ext(n, m_trail); bool visret = holder().visitor().visit_ext(n, static_cast<uint32_t>(m_trail));
parse_return upr = after_visit_proc(visret, off); parse_return upr = after_visit_proc(visret, off);
if (upr != PARSE_CONTINUE) return upr; if (upr != PARSE_CONTINUE) return upr;
} }
@ -545,7 +545,7 @@ inline parse_return context<VisitorHolder>::execute(const char* data, std::size_
m_trail = tmp; m_trail = tmp;
++m_trail; ++m_trail;
if(m_trail == 0) { if(m_trail == 0) {
bool visret = holder().visitor().visit_ext(n, m_trail); bool visret = holder().visitor().visit_ext(n, static_cast<uint32_t>(m_trail));
parse_return upr = after_visit_proc(visret, off); parse_return upr = after_visit_proc(visret, off);
if (upr != PARSE_CONTINUE) return upr; if (upr != PARSE_CONTINUE) return upr;
} }
@ -555,7 +555,7 @@ inline parse_return context<VisitorHolder>::execute(const char* data, std::size_
} }
} break; } break;
case MSGPACK_ACS_STR_VALUE: { case MSGPACK_ACS_STR_VALUE: {
bool visret = holder().visitor().visit_str(n, m_trail); bool visret = holder().visitor().visit_str(n, static_cast<uint32_t>(m_trail));
parse_return upr = after_visit_proc(visret, off); parse_return upr = after_visit_proc(visret, off);
if (upr != PARSE_CONTINUE) return upr; if (upr != PARSE_CONTINUE) return upr;
} break; } break;
@ -565,7 +565,7 @@ inline parse_return context<VisitorHolder>::execute(const char* data, std::size_
if (upr != PARSE_CONTINUE) return upr; if (upr != PARSE_CONTINUE) return upr;
} break; } break;
case MSGPACK_ACS_EXT_VALUE: { case MSGPACK_ACS_EXT_VALUE: {
bool visret = holder().visitor().visit_ext(n, m_trail); bool visret = holder().visitor().visit_ext(n, static_cast<uint32_t>(m_trail));
parse_return upr = after_visit_proc(visret, off); parse_return upr = after_visit_proc(visret, off);
if (upr != PARSE_CONTINUE) return upr; if (upr != PARSE_CONTINUE) return upr;
} break; } break;