aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/os/msgpack_rpc_helpers.c
diff options
context:
space:
mode:
authorThiago de Arruda <tpadilha84@gmail.com>2014-08-31 10:46:28 -0300
committerThiago de Arruda <tpadilha84@gmail.com>2014-09-12 13:19:50 -0300
commite2143674ae20fbadbea004bd54d6f5dc32b83803 (patch)
tree0c14bff4b9019cdf314a9a96d947b127bd61e2d9 /src/nvim/os/msgpack_rpc_helpers.c
parent042aca6eb4d0fe9e6ddf3bcfb96a39838b2633d1 (diff)
downloadrneovim-e2143674ae20fbadbea004bd54d6f5dc32b83803.tar.gz
rneovim-e2143674ae20fbadbea004bd54d6f5dc32b83803.tar.bz2
rneovim-e2143674ae20fbadbea004bd54d6f5dc32b83803.zip
deps: Update to the experimental msgpack v5 branch
Using msgpack v5 will let nvim be more compatible with msgpack libraries for other platforms. This also replaces "raw" references by "bin" which is the new name for msgpack binary data type
Diffstat (limited to 'src/nvim/os/msgpack_rpc_helpers.c')
-rw-r--r--src/nvim/os/msgpack_rpc_helpers.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/nvim/os/msgpack_rpc_helpers.c b/src/nvim/os/msgpack_rpc_helpers.c
index e2c277abe4..eb43c3b2a6 100644
--- a/src/nvim/os/msgpack_rpc_helpers.c
+++ b/src/nvim/os/msgpack_rpc_helpers.c
@@ -81,12 +81,12 @@ bool msgpack_rpc_to_float(msgpack_object *obj, Float *arg)
bool msgpack_rpc_to_string(msgpack_object *obj, String *arg)
{
- if (obj->type != MSGPACK_OBJECT_RAW) {
+ if (obj->type != MSGPACK_OBJECT_BIN) {
return false;
}
- arg->data = xmemdupz(obj->via.raw.ptr, obj->via.raw.size);
- arg->size = obj->via.raw.size;
+ arg->data = xmemdupz(obj->via.bin.ptr, obj->via.bin.size);
+ arg->size = obj->via.bin.size;
return true;
}
@@ -110,7 +110,7 @@ bool msgpack_rpc_to_object(msgpack_object *obj, Object *arg)
arg->type = kObjectTypeFloat;
return msgpack_rpc_to_float(obj, &arg->data.floating);
- case MSGPACK_OBJECT_RAW:
+ case MSGPACK_OBJECT_BIN:
arg->type = kObjectTypeString;
return msgpack_rpc_to_string(obj, &arg->data.string);
@@ -200,8 +200,8 @@ void msgpack_rpc_from_float(Float result, msgpack_packer *res)
void msgpack_rpc_from_string(String result, msgpack_packer *res)
{
- msgpack_pack_raw(res, result.size);
- msgpack_pack_raw_body(res, result.data, result.size);
+ msgpack_pack_bin(res, result.size);
+ msgpack_pack_bin_body(res, result.data, result.size);
}
void msgpack_rpc_from_object(Object result, msgpack_packer *res)