From ed02278e42b822a339a12475d81c377271e528f8 Mon Sep 17 00:00:00 2001 From: micha Date: Wed, 27 Jun 2018 17:08:55 +0200 Subject: 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 --- src/nvim/api/private/dispatch.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/nvim/api/private/dispatch.c') diff --git a/src/nvim/api/private/dispatch.c b/src/nvim/api/private/dispatch.c index 5207a57b88..2e59d3faa9 100644 --- a/src/nvim/api/private/dispatch.c +++ b/src/nvim/api/private/dispatch.c @@ -32,16 +32,19 @@ static void msgpack_rpc_add_method_handler(String method, /// @param name API method name /// @param name_len name size (includes terminating NUL) MsgpackRpcRequestHandler msgpack_rpc_get_handler_for(const char *name, - size_t name_len) + size_t name_len, + Error *error) { String m = { .data = (char *)name, .size = name_len }; MsgpackRpcRequestHandler rv = map_get(String, MsgpackRpcRequestHandler)(methods, m); if (!rv.fn) { - rv.fn = msgpack_rpc_handle_missing_method; + String method_name = m.size > 0 ? + m : cstr_as_string(""); + api_set_error(error, kErrorTypeException, "Invalid method: %s", + method_name); } - return rv; } -- cgit From 099718ae6d57239164d4348e6c7576edf7a2ebb7 Mon Sep 17 00:00:00 2001 From: micha Date: Sun, 15 Jul 2018 12:12:03 +0200 Subject: dispatch.c: changed api_set_error_call --- src/nvim/api/private/dispatch.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/nvim/api/private/dispatch.c') diff --git a/src/nvim/api/private/dispatch.c b/src/nvim/api/private/dispatch.c index 2e59d3faa9..dec2b6c185 100644 --- a/src/nvim/api/private/dispatch.c +++ b/src/nvim/api/private/dispatch.c @@ -40,10 +40,8 @@ MsgpackRpcRequestHandler msgpack_rpc_get_handler_for(const char *name, map_get(String, MsgpackRpcRequestHandler)(methods, m); if (!rv.fn) { - String method_name = m.size > 0 ? - m : cstr_as_string(""); api_set_error(error, kErrorTypeException, "Invalid method: %s", - method_name); + m.size > 0 ? m.data : ""); } return rv; } -- cgit