Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

object: add fixint support #1136

Closed
wants to merge 1 commit into from
Closed

object: add fixint support #1136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion include/msgpack/object.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,15 @@ typedef enum {
MSGPACK_OBJECT_ARRAY = 0x06,
MSGPACK_OBJECT_MAP = 0x07,
MSGPACK_OBJECT_BIN = 0x08,
MSGPACK_OBJECT_EXT = 0x09
MSGPACK_OBJECT_EXT = 0x09,
MSGPACK_OBJECT_FIX_UINT8 = 0x20,
MSGPACK_OBJECT_FIX_UINT16 = 0x21,
MSGPACK_OBJECT_FIX_UINT32 = 0x22,
MSGPACK_OBJECT_FIX_UINT64 = 0x23,
MSGPACK_OBJECT_FIX_INT8 = 0x30,
MSGPACK_OBJECT_FIX_INT16 = 0x31,
MSGPACK_OBJECT_FIX_INT32 = 0x32,
MSGPACK_OBJECT_FIX_INT64 = 0x33
} msgpack_object_type;


Expand Down
48 changes: 48 additions & 0 deletions src/objectc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,30 @@ int msgpack_pack_object(msgpack_packer* pk, msgpack_object d)
}
}

case MSGPACK_OBJECT_FIX_UINT8:
return msgpack_pack_fix_uint8(pk, (uint8_t)d.via.u64);

case MSGPACK_OBJECT_FIX_UINT16:
return msgpack_pack_fix_uint16(pk, (uint16_t)d.via.u64);

case MSGPACK_OBJECT_FIX_UINT32:
return msgpack_pack_fix_uint32(pk, (uint32_t)d.via.u64);

case MSGPACK_OBJECT_FIX_UINT64:
return msgpack_pack_fix_uint64(pk, (uint64_t)d.via.u64);

case MSGPACK_OBJECT_FIX_INT8:
return msgpack_pack_fix_int8(pk, (int8_t)d.via.i64);

case MSGPACK_OBJECT_FIX_INT16:
return msgpack_pack_fix_int16(pk, (int16_t)d.via.i64);

case MSGPACK_OBJECT_FIX_INT32:
return msgpack_pack_fix_int32(pk, (int32_t)d.via.i64);

case MSGPACK_OBJECT_FIX_INT64:
return msgpack_pack_fix_int64(pk, (int64_t)d.via.i64);

default:
return -1;
}
Expand Down Expand Up @@ -153,6 +177,10 @@ void msgpack_object_print(FILE* out, msgpack_object o)
break;

case MSGPACK_OBJECT_POSITIVE_INTEGER:
case MSGPACK_OBJECT_FIX_UINT8:
case MSGPACK_OBJECT_FIX_UINT16:
case MSGPACK_OBJECT_FIX_UINT32:
case MSGPACK_OBJECT_FIX_UINT64:
#if defined(PRIu64)
fprintf(out, "%" PRIu64, o.via.u64);
#else
Expand All @@ -164,6 +192,10 @@ void msgpack_object_print(FILE* out, msgpack_object o)
break;

case MSGPACK_OBJECT_NEGATIVE_INTEGER:
case MSGPACK_OBJECT_FIX_INT8:
case MSGPACK_OBJECT_FIX_INT16:
case MSGPACK_OBJECT_FIX_INT32:
case MSGPACK_OBJECT_FIX_INT64:
#if defined(PRIi64)
fprintf(out, "%" PRIi64, o.via.i64);
#else
Expand Down Expand Up @@ -299,6 +331,10 @@ int msgpack_object_print_buffer(char *buffer, size_t buffer_size, msgpack_object
break;

case MSGPACK_OBJECT_POSITIVE_INTEGER:
case MSGPACK_OBJECT_FIX_UINT8:
case MSGPACK_OBJECT_FIX_UINT16:
case MSGPACK_OBJECT_FIX_UINT32:
case MSGPACK_OBJECT_FIX_UINT64:
#if defined(PRIu64)
MSGPACK_CHECKED_CALL(ret, snprintf, aux_buffer, aux_buffer_size, "%" PRIu64, o.via.u64);
#else
Expand All @@ -311,6 +347,10 @@ int msgpack_object_print_buffer(char *buffer, size_t buffer_size, msgpack_object
break;

case MSGPACK_OBJECT_NEGATIVE_INTEGER:
case MSGPACK_OBJECT_FIX_INT8:
case MSGPACK_OBJECT_FIX_INT16:
case MSGPACK_OBJECT_FIX_INT32:
case MSGPACK_OBJECT_FIX_INT64:
#if defined(PRIi64)
MSGPACK_CHECKED_CALL(ret, snprintf, aux_buffer, aux_buffer_size, "%" PRIi64, o.via.i64);
#else
Expand Down Expand Up @@ -418,9 +458,17 @@ bool msgpack_object_equal(const msgpack_object x, const msgpack_object y)
return x.via.boolean == y.via.boolean;

case MSGPACK_OBJECT_POSITIVE_INTEGER:
case MSGPACK_OBJECT_FIX_UINT8:
case MSGPACK_OBJECT_FIX_UINT16:
case MSGPACK_OBJECT_FIX_UINT32:
case MSGPACK_OBJECT_FIX_UINT64:
return x.via.u64 == y.via.u64;

case MSGPACK_OBJECT_NEGATIVE_INTEGER:
case MSGPACK_OBJECT_FIX_INT8:
case MSGPACK_OBJECT_FIX_INT16:
case MSGPACK_OBJECT_FIX_INT32:
case MSGPACK_OBJECT_FIX_INT64:
return x.via.i64 == y.via.i64;

case MSGPACK_OBJECT_FLOAT32:
Expand Down
Loading