diff options
author | micha <michoffmann.potsdam@gmail.com> | 2018-06-27 17:08:55 +0200 |
---|---|---|
committer | micha <michoffmann.potsdam@gmail.com> | 2018-07-14 11:47:18 +0200 |
commit | ed02278e42b822a339a12475d81c377271e528f8 (patch) | |
tree | 7eb231c60492fef38288bd46fb9d94131e5ab097 /src/nvim/api/vim.c | |
parent | 4874214139ab86f7033d5e6c602f7515ed813443 (diff) | |
download | rneovim-ed02278e42b822a339a12475d81c377271e528f8.tar.gz rneovim-ed02278e42b822a339a12475d81c377271e528f8.tar.bz2 rneovim-ed02278e42b822a339a12475d81c377271e528f8.zip |
channel.c: refactor spaghetti code
channel.c: WIP remove redundant method check and added FUNC_ATTR_NONNULL_ALL macro
channel.c channel_defs.h helpers.c: added Error field to RequestEvent, added no_op handler func
channel.c: use const char* instead of string and cleanup
channel.c; channel_defs.h; helpers.c: removed error from event again; send errors directly to the channel without using handlers and events
channel.c: fixed memory leak and lint errors
api/private/dispatch.c; api/vim.c; msgpack_rpc/channel.c msgpack_rpc/helpers.c added Error* field to msgpack_get_handler_for; further refactored channel.c
channel.c:323 changed order of evaluation in if statement
channel.c: removed superflous whitespace
dispatch.c: review comment
Diffstat (limited to 'src/nvim/api/vim.c')
-rw-r--r-- | src/nvim/api/vim.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c index 002d9da781..03567ddfd8 100644 --- a/src/nvim/api/vim.c +++ b/src/nvim/api/vim.c @@ -1162,11 +1162,12 @@ Array nvim_call_atomic(uint64_t channel_id, Array calls, Error *err) } Array args = call.items[1].data.array; - MsgpackRpcRequestHandler handler = msgpack_rpc_get_handler_for(name.data, - name.size); - if (handler.fn == msgpack_rpc_handle_missing_method) { - api_set_error(&nested_error, kErrorTypeException, "Invalid method: %s", - name.size > 0 ? name.data : "<empty>"); + MsgpackRpcRequestHandler handler = + msgpack_rpc_get_handler_for(name.data, + name.size, + &nested_error); + + if (ERROR_SET(&nested_error)) { break; } Object result = handler.fn(channel_id, args, &nested_error); |