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

menu: use char* for set_context_in_menu_cmd() param

Browse Source 
All calls to set_context_in_menu_cmd() cast "cmd" arg to char_u.
get_menu_cmd_nodes() doesn't require "cmd" to be unsigned char.
Use "char" type for "cmd" function param to reduce type casts.
This commit is contained in:
Jan Edmund Lazo
2021-02-07 12:04:22 -05:00
parent 0458b23d53
commit b1df53e868
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/eval/funcs.c
View File

@@ -2149,7 +2149,7 @@ static void f_menu_get(typval_T *argvars, typval_T *rettv, FunPtr fptr)
tv_list_alloc_ret(rettv, kListLenMayKnow); tv_list_alloc_ret(rettv, kListLenMayKnow);
int modes = MENU_ALL_MODES; int modes = MENU_ALL_MODES;
if (argvars[1].v_type == VAR_STRING) { if (argvars[1].v_type == VAR_STRING) {
const char_u *const strmodes = (char_u *)tv_get_string(&argvars[1]); const char *const strmodes = tv_get_string(&argvars[1]);
modes = get_menu_cmd_modes(strmodes, false, NULL, NULL); modes = get_menu_cmd_modes(strmodes, false, NULL, NULL);
} }
menu_get((char_u *)tv_get_string(&argvars[0]), modes, rettv->vval.v_list); menu_get((char_u *)tv_get_string(&argvars[0]), modes, rettv->vval.v_list);
@@ -3170,7 +3170,7 @@ static void f_getcompletion(typval_T *argvars, typval_T *rettv, FunPtr fptr)
} }
if (xpc.xp_context == EXPAND_MENUS) { if (xpc.xp_context == EXPAND_MENUS) {
set_context_in_menu_cmd(&xpc, (char_u *)"menu", xpc.xp_pattern, false); set_context_in_menu_cmd(&xpc, "menu", xpc.xp_pattern, false);
xpc.xp_pattern_len = STRLEN(xpc.xp_pattern); xpc.xp_pattern_len = STRLEN(xpc.xp_pattern);
} }

4
src/nvim/ex_docmd.c
View File

@@ -3518,7 +3518,7 @@ const char * set_one_cmd_context(
// EX_XFILE: file names are handled above. // EX_XFILE: file names are handled above.
if (!(ea.argt & EX_XFILE)) { if (!(ea.argt & EX_XFILE)) {
if (context == EXPAND_MENUS) { if (context == EXPAND_MENUS) {
return (const char *)set_context_in_menu_cmd(xp, (char_u *)cmd, return (const char *)set_context_in_menu_cmd(xp, cmd,
(char_u *)arg, forceit); (char_u *)arg, forceit);
} else if (context == EXPAND_COMMANDS) { } else if (context == EXPAND_COMMANDS) {
return arg; return arg;
@@ -3598,7 +3598,7 @@ const char * set_one_cmd_context(
case CMD_tmenu: case CMD_tunmenu: case CMD_tmenu: case CMD_tunmenu:
case CMD_popup: case CMD_emenu: case CMD_popup: case CMD_emenu:
return (const char *)set_context_in_menu_cmd( return (const char *)set_context_in_menu_cmd(
xp, (char_u *)cmd, (char_u *)arg, forceit); xp, cmd, (char_u *)arg, forceit);
case CMD_colorscheme: case CMD_colorscheme:
xp->xp_context = EXPAND_COLORS; xp->xp_context = EXPAND_COLORS;

8
src/nvim/menu.c
View File

@@ -81,7 +81,7 @@ ex_menu(exarg_T *eap)
// kFalse for "menu disable // kFalse for "menu disable
vimmenu_T menuarg; vimmenu_T menuarg;
modes = get_menu_cmd_modes(eap->cmd, eap->forceit, &noremap, &unmenu); modes = get_menu_cmd_modes((char *)eap->cmd, eap->forceit, &noremap, &unmenu);
arg = eap->arg; arg = eap->arg;
for (;; ) { for (;; ) {
@@ -912,7 +912,9 @@ static int expand_emenu; /* TRUE for ":emenu" command */
/* /*
* Work out what to complete when doing command line completion of menu names. * Work out what to complete when doing command line completion of menu names.
*/ */
char_u *set_context_in_menu_cmd(expand_T *xp, char_u *cmd, char_u *arg, int forceit) char_u *set_context_in_menu_cmd(expand_T *xp, const char *cmd, char_u *arg,
bool forceit)
FUNC_ATTR_NONNULL_ALL
{ {
char_u *after_dot; char_u *after_dot;
char_u *p; char_u *p;
@@ -1178,7 +1180,7 @@ static bool menu_namecmp(const char_u *const name, const char_u *const mname)
/// to whether the command is an "unmenu" command. /// to whether the command is an "unmenu" command.
int int
get_menu_cmd_modes( get_menu_cmd_modes(
const char_u * cmd, const char *cmd,
bool forceit, bool forceit,
int *noremap, int *noremap,
int *unmenu int *unmenu