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

Older compilers don't allow declaring variables other than at the top of

Browse Source 
the block if it is a C file.
This commit is contained in:
David LeBlanc 2019-05-06 19:28:25 -07:00
parent 2d54c0e918
commit a2f3689865
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/unpack.c
View File

@ -189,6 +189,7 @@ static inline int template_callback_false(unpack_user* u, msgpack_object* o)
static inline int template_callback_array(unpack_user* u, unsigned int n, msgpack_object* o) static inline int template_callback_array(unpack_user* u, unsigned int n, msgpack_object* o)
{ {
size_t size;
// Let's leverage the fact that sizeof(msgpack_object) is a compile time constant // Let's leverage the fact that sizeof(msgpack_object) is a compile time constant
// to check for int overflows. // to check for int overflows.
// Note - while n is constrained to 32-bit, the product of n * sizeof(msgpack_object) // Note - while n is constrained to 32-bit, the product of n * sizeof(msgpack_object)
@ -199,7 +200,7 @@ static inline int template_callback_array(unpack_user* u, unsigned int n, msgpac
o->type = MSGPACK_OBJECT_ARRAY; o->type = MSGPACK_OBJECT_ARRAY;
o->via.array.size = 0; o->via.array.size = 0;
size_t size = n * sizeof(msgpack_object); size = n * sizeof(msgpack_object);
if (*u->z == NULL) { if (*u->z == NULL) {
*u->z = msgpack_zone_new(MSGPACK_ZONE_CHUNK_SIZE); *u->z = msgpack_zone_new(MSGPACK_ZONE_CHUNK_SIZE);
@ -228,6 +229,7 @@ static inline int template_callback_array_item(unpack_user* u, msgpack_object* c
static inline int template_callback_map(unpack_user* u, unsigned int n, msgpack_object* o) static inline int template_callback_map(unpack_user* u, unsigned int n, msgpack_object* o)
{ {
size_t size;
// Let's leverage the fact that sizeof(msgpack_object_kv) is a compile time constant // Let's leverage the fact that sizeof(msgpack_object_kv) is a compile time constant
// to check for int overflows // to check for int overflows
// Note - while n is constrained to 32-bit, the product of n * sizeof(msgpack_object) // Note - while n is constrained to 32-bit, the product of n * sizeof(msgpack_object)
@ -239,7 +241,7 @@ static inline int template_callback_map(unpack_user* u, unsigned int n, msgpack_
o->type = MSGPACK_OBJECT_MAP; o->type = MSGPACK_OBJECT_MAP;
o->via.map.size = 0; o->via.map.size = 0;
size_t size = n * sizeof(msgpack_object_kv); size = n * sizeof(msgpack_object_kv);
if (*u->z == NULL) { if (*u->z == NULL) {
*u->z = msgpack_zone_new(MSGPACK_ZONE_CHUNK_SIZE); *u->z = msgpack_zone_new(MSGPACK_ZONE_CHUNK_SIZE);