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

eval: use char* for set_var_lval() param

Browse Source 
'op' param is casted to char_u* within set_val_lval().
Most calls to set_val_lval() cast arg to 'op' from char to char_u.
Remove these pointless type casts.
This commit is contained in:
Jan Edmund Lazo
2021-02-07 11:19:17 -05:00
parent 7484c7de9a
commit 0458b23d53
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/nvim/eval.c
View File

@@ -523,9 +523,9 @@ var_redir_start(
tv.v_type = VAR_STRING; tv.v_type = VAR_STRING;
tv.vval.v_string = (char_u *)""; tv.vval.v_string = (char_u *)"";
if (append) { if (append) {
set_var_lval(redir_lval, redir_endp, &tv, true, false, (char_u *)"."); set_var_lval(redir_lval, redir_endp, &tv, true, false, ".");
} else { } else {
set_var_lval(redir_lval, redir_endp, &tv, true, false, (char_u *)"="); set_var_lval(redir_lval, redir_endp, &tv, true, false, "=");
} }
clear_lval(redir_lval); clear_lval(redir_lval);
err = did_emsg; err = did_emsg;
@@ -585,7 +585,7 @@ void var_redir_stop(void)
redir_endp = (char_u *)get_lval(redir_varname, NULL, redir_lval, redir_endp = (char_u *)get_lval(redir_varname, NULL, redir_lval,
false, false, 0, FNE_CHECK_START); false, false, 0, FNE_CHECK_START);
if (redir_endp != NULL && redir_lval->ll_name != NULL) { if (redir_endp != NULL && redir_lval->ll_name != NULL) {
set_var_lval(redir_lval, redir_endp, &tv, false, false, (char_u *)"."); set_var_lval(redir_lval, redir_endp, &tv, false, false, ".");
} }
clear_lval(redir_lval); clear_lval(redir_lval);
} }
@@ -1925,7 +1925,7 @@ static char_u *ex_let_one(char_u *arg, typval_T *const tv,
if (endchars != NULL && vim_strchr(endchars, *skipwhite(p)) == NULL) { if (endchars != NULL && vim_strchr(endchars, *skipwhite(p)) == NULL) {
EMSG(_(e_letunexp)); EMSG(_(e_letunexp));
} else { } else {
set_var_lval(&lv, p, tv, copy, is_const, op); set_var_lval(&lv, p, tv, copy, is_const, (const char *)op);
arg_end = p; arg_end = p;
} }
} }
@@ -2299,7 +2299,7 @@ void clear_lval(lval_T *lp)
* "%" for "%=", "." for ".=" or "=" for "=". * "%" for "%=", "." for ".=" or "=" for "=".
*/ */
static void set_var_lval(lval_T *lp, char_u *endp, typval_T *rettv, static void set_var_lval(lval_T *lp, char_u *endp, typval_T *rettv,
int copy, const bool is_const, const char_u *op) int copy, const bool is_const, const char *op)
{ {
int cc; int cc;
listitem_T *ri; listitem_T *ri;
@@ -2326,7 +2326,7 @@ static void set_var_lval(lval_T *lp, char_u *endp, typval_T *rettv,
TV_CSTRING) TV_CSTRING)
&& !tv_check_lock(di->di_tv.v_lock, (const char *)lp->ll_name, && !tv_check_lock(di->di_tv.v_lock, (const char *)lp->ll_name,
TV_CSTRING))) TV_CSTRING)))
&& eexe_mod_op(&tv, rettv, (const char *)op) == OK) { && eexe_mod_op(&tv, rettv, op) == OK) {
set_var(lp->ll_name, lp->ll_name_len, &tv, false); set_var(lp->ll_name, lp->ll_name_len, &tv, false);
} }
tv_clear(&tv); tv_clear(&tv);
@@ -2369,8 +2369,7 @@ static void set_var_lval(lval_T *lp, char_u *endp, typval_T *rettv,
*/ */
for (ri = tv_list_first(rettv->vval.v_list); ri != NULL; ) { for (ri = tv_list_first(rettv->vval.v_list); ri != NULL; ) {
if (op != NULL && *op != '=') { if (op != NULL && *op != '=') {
eexe_mod_op(TV_LIST_ITEM_TV(lp->ll_li), TV_LIST_ITEM_TV(ri), eexe_mod_op(TV_LIST_ITEM_TV(lp->ll_li), TV_LIST_ITEM_TV(ri), op);
(const char *)op);
} else { } else {
tv_clear(TV_LIST_ITEM_TV(lp->ll_li)); tv_clear(TV_LIST_ITEM_TV(lp->ll_li));
tv_copy(TV_LIST_ITEM_TV(ri), TV_LIST_ITEM_TV(lp->ll_li)); tv_copy(TV_LIST_ITEM_TV(ri), TV_LIST_ITEM_TV(lp->ll_li));
@@ -2428,7 +2427,7 @@ static void set_var_lval(lval_T *lp, char_u *endp, typval_T *rettv,
} }
if (op != NULL && *op != '=') { if (op != NULL && *op != '=') {
eexe_mod_op(lp->ll_tv, rettv, (const char *)op); eexe_mod_op(lp->ll_tv, rettv, op);
goto notify; goto notify;
} else { } else {
tv_clear(lp->ll_tv); tv_clear(lp->ll_tv);