bufhl: fix unittests and lint

msgpack_rpc_dispatch doesn't exist anymore

3 files changed, 16 insertions, 34 deletions

diff --git a/src/nvim/buffer_defs.h b/src/nvim/buffer_defs.h
index 5666e3fdb6..936a14b903 100644
--- a/src/nvim/buffer_defs.h
+++ b/src/nvim/buffer_defs.h
@@ -61,21 +61,21 @@ typedef struct file_buffer buf_T; // Forward declaration
 #define VALID_BOTLINE_AP 0x40   /* w_botine is approximated */
 #define VALID_TOPLINE   0x80    /* w_topline is valid (for cursor position) */
 
-/* flags for b_flags */
-#define BF_RECOVERED    0x01    /* buffer has been recovered */
-#define BF_CHECK_RO     0x02    /* need to check readonly when loading file
-                                   into buffer (set by ":e", may be reset by
-                                   ":buf" */
-#define BF_NEVERLOADED  0x04    /* file has never been loaded into buffer,
-                                   many variables still need to be set */
-#define BF_NOTEDITED    0x08    /* Set when file name is changed after
-                                   starting to edit, reset when file is
-                                   written out. */
-#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_READERR      0x40    /* got errors while reading the file */
-#define BF_DUMMY        0x80    /* dummy buffer, only used internally */
-#define BF_PRESERVED    0x100   /* ":preserve" was used */
+// flags for b_flags
+#define BF_RECOVERED    0x01    // buffer has been recovered
+#define BF_CHECK_RO     0x02    // need to check readonly when loading file
+                                // into buffer (set by ":e", may be reset by
+                                // ":buf")
+#define BF_NEVERLOADED  0x04    // file has never been loaded into buffer,
+                                // many variables still need to be set
+#define BF_NOTEDITED    0x08    // Set when file name is changed after
+                                // starting to edit, reset when file is
+                                // written out.
+#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_READERR      0x40    // got errors while reading the file
+#define BF_DUMMY        0x80    // dummy buffer, only used internally
+#define BF_PRESERVED    0x100   // ":preserve" was used
 
 /* Mask to check for flags that prevent normal writing */
 #define BF_WRITE_MASK   (BF_NOTEDITED + BF_NEW + BF_READERR)
diff --git a/src/nvim/lib/khash.h b/src/nvim/lib/khash.h
index 56be29d14c..8287cb14da 100644
--- a/src/nvim/lib/khash.h
+++ b/src/nvim/lib/khash.h
@@ -184,7 +184,7 @@ typedef khint_t khiter_t;
 #define kfree(P) xfree(P)
 #endif
 
-static const double __ac_HASH_UPPER = 0.77;
+#define __ac_HASH_UPPER 0.77
 
 #define __KHASH_TYPE(name, khkey_t, khval_t) \
 	typedef struct { \
diff --git a/src/nvim/msgpack_rpc/defs.h b/src/nvim/msgpack_rpc/defs.h
index d97cf28ca1..5611636d4f 100644
--- a/src/nvim/msgpack_rpc/defs.h
+++ b/src/nvim/msgpack_rpc/defs.h
@@ -1,8 +1,6 @@
 #ifndef 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
 /// functions of this type.
@@ -24,22 +22,6 @@ void msgpack_rpc_add_method_handler(String method,
 
 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,
                                                      size_t name_len)
   FUNC_ATTR_NONNULL_ARG(1);