mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-28 22:18:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

bufhl: fix unittests and lint

Browse Source 
msgpack_rpc_dispatch doesn't exist anymore
This commit is contained in:
Björn Linse
2016-01-26 15:32:00 +01:00
parent 06b9d2a6f2
commit 3b1800be94
3 changed files with 16 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/nvim/buffer_defs.h
View File

@@ -61,21 +61,21 @@ typedef struct file_buffer buf_T; // Forward declaration
#define VALID_BOTLINE_AP 0x40 /* w_botine is approximated */ #define VALID_BOTLINE_AP 0x40 /* w_botine is approximated */
#define VALID_TOPLINE 0x80 /* w_topline is valid (for cursor position) */ #define VALID_TOPLINE 0x80 /* w_topline is valid (for cursor position) */
/* flags for b_flags */ // flags for b_flags
#define BF_RECOVERED 0x01 /* buffer has been recovered */ #define BF_RECOVERED 0x01 // buffer has been recovered
#define BF_CHECK_RO 0x02 /* need to check readonly when loading file #define BF_CHECK_RO 0x02 // need to check readonly when loading file
into buffer (set by ":e", may be reset by // into buffer (set by ":e", may be reset by
":buf" */ // ":buf")
#define BF_NEVERLOADED 0x04 /* file has never been loaded into buffer, #define BF_NEVERLOADED 0x04 // file has never been loaded into buffer,
many variables still need to be set */ // many variables still need to be set
#define BF_NOTEDITED 0x08 /* Set when file name is changed after #define BF_NOTEDITED 0x08 // Set when file name is changed after
starting to edit, reset when file is // starting to edit, reset when file is
written out. */ // written out.
#define BF_NEW 0x10 /* file didn't exist when editing started */ #define BF_NEW 0x10 // file didn't exist when editing started
#define BF_NEW_W 0x20 /* Warned for BF_NEW and file created */ #define BF_NEW_W 0x20 // Warned for BF_NEW and file created
#define BF_READERR 0x40 /* got errors while reading the file */ #define BF_READERR 0x40 // got errors while reading the file
#define BF_DUMMY 0x80 /* dummy buffer, only used internally */ #define BF_DUMMY 0x80 // dummy buffer, only used internally
#define BF_PRESERVED 0x100 /* ":preserve" was used */ #define BF_PRESERVED 0x100 // ":preserve" was used
/* Mask to check for flags that prevent normal writing */ /* Mask to check for flags that prevent normal writing */
#define BF_WRITE_MASK (BF_NOTEDITED + BF_NEW + BF_READERR) #define BF_WRITE_MASK (BF_NOTEDITED + BF_NEW + BF_READERR)

2
src/nvim/lib/khash.h
View File

@@ -184,7 +184,7 @@ typedef khint_t khiter_t;
#define kfree(P) xfree(P) #define kfree(P) xfree(P)
#endif #endif
static const double __ac_HASH_UPPER = 0.77; #define __ac_HASH_UPPER 0.77
#define __KHASH_TYPE(name, khkey_t, khval_t) \ #define __KHASH_TYPE(name, khkey_t, khval_t) \
typedef struct { \ typedef struct { \

18
src/nvim/msgpack_rpc/defs.h
View File

@@ -1,8 +1,6 @@
#ifndef NVIM_MSGPACK_RPC_DEFS_H #ifndef NVIM_MSGPACK_RPC_DEFS_H
#define NVIM_MSGPACK_RPC_DEFS_H #define NVIM_MSGPACK_RPC_DEFS_H
#include <msgpack.h>
/// The rpc_method_handlers table, used in msgpack_rpc_dispatch(), stores /// The rpc_method_handlers table, used in msgpack_rpc_dispatch(), stores
/// functions of this type. /// functions of this type.
@@ -24,22 +22,6 @@ void msgpack_rpc_add_method_handler(String method,
void msgpack_rpc_init_function_metadata(Dictionary *metadata); void msgpack_rpc_init_function_metadata(Dictionary *metadata);
/// Dispatches to the actual API function after basic payload validation by
/// `msgpack_rpc_call`. It is responsible for validating/converting arguments
/// to C types, and converting the return value back to msgpack types.
/// The implementation is generated at compile time with metadata extracted
/// from the api/*.h headers,
///
/// @param channel_id The channel id
/// @param method_id The method id
/// @param req The parsed request object
/// @param error Pointer to error structure
/// @return Some object
Object msgpack_rpc_dispatch(uint64_t channel_id,
msgpack_object *req,
Error *error)
FUNC_ATTR_NONNULL_ARG(2) FUNC_ATTR_NONNULL_ARG(3);
MsgpackRpcRequestHandler msgpack_rpc_get_handler_for(const char *name, MsgpackRpcRequestHandler msgpack_rpc_get_handler_for(const char *name,
size_t name_len) size_t name_len)
FUNC_ATTR_NONNULL_ARG(1); FUNC_ATTR_NONNULL_ARG(1);