aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/msgpack_rpc/channel.c
diff options
context:
space:
mode:
authorFamiu Haque <famiuhaque@proton.me>2023-05-23 14:25:10 +0600
committerFamiu Haque <famiuhaque@proton.me>2023-05-23 15:20:41 +0600
commitcfd4fdfea4d0e68ea50ad412b88b5289ded6fd6f (patch)
tree9cae576fc90b55c9586286706a9d1754762bea8b /src/nvim/msgpack_rpc/channel.c
parent62a80c36c158ecf4ffc8c93d8891aeb2f0d2f287 (diff)
downloadrneovim-cfd4fdfea4d0e68ea50ad412b88b5289ded6fd6f.tar.gz
rneovim-cfd4fdfea4d0e68ea50ad412b88b5289ded6fd6f.tar.bz2
rneovim-cfd4fdfea4d0e68ea50ad412b88b5289ded6fd6f.zip
refactor(api): new helper macros
Adds new API helper macros `CSTR_AS_OBJ()`, `STATIC_CSTR_AS_OBJ()`, and `STATIC_CSTR_TO_OBJ()`, which cleans up a lot of the current code. These macros will also be used extensively in the upcoming option refactor PRs because then API Objects will be used to get/set options. This PR also modifies pre-existing code to use old API helper macros like `CSTR_TO_OBJ()` to make them cleaner.
Diffstat (limited to 'src/nvim/msgpack_rpc/channel.c')
-rw-r--r--src/nvim/msgpack_rpc/channel.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/msgpack_rpc/channel.c b/src/nvim/msgpack_rpc/channel.c
index cd5daee915..1772b0497b 100644
--- a/src/nvim/msgpack_rpc/channel.c
+++ b/src/nvim/msgpack_rpc/channel.c
@@ -628,7 +628,7 @@ static void chan_close_with_error(Channel *channel, char *msg, int loglevel)
ChannelCallFrame *frame = kv_A(channel->rpc.call_stack, i);
frame->returned = true;
frame->errored = true;
- frame->result = STRING_OBJ(cstr_to_string(msg));
+ frame->result = CSTR_TO_OBJ(msg);
}
channel_close(channel->id, kChannelPartRpc, NULL);
@@ -665,7 +665,7 @@ static WBuffer *serialize_response(uint64_t channel_id, MsgpackRpcRequestHandler
} else {
Array args = ARRAY_DICT_INIT;
ADD(args, INTEGER_OBJ(err->type));
- ADD(args, STRING_OBJ(cstr_to_string(err->msg)));
+ ADD(args, CSTR_TO_OBJ(err->msg));
msgpack_rpc_serialize_request(0, cstr_as_string("nvim_error_event"),
args, &pac);
api_free_array(args);