mirror of
https://github.com/neovim/neovim.git
synced 2025-09-17 08:48:16 +00:00
refactor: replace char_u with char
Work on https://github.com/neovim/neovim/issues/459
This commit is contained in:
@@ -1091,7 +1091,7 @@ static int qf_init_ext(qf_info_T *qi, int qf_idx, const char *restrict efile, bu
|
||||
|
||||
// Use the local value of 'errorformat' if it's set.
|
||||
if (errorformat == p_efm && tv == NULL && buf && *buf->b_p_efm != NUL) {
|
||||
efm = (char *)buf->b_p_efm;
|
||||
efm = buf->b_p_efm;
|
||||
} else {
|
||||
efm = errorformat;
|
||||
}
|
||||
@@ -2534,7 +2534,7 @@ static int qf_open_new_file_win(qf_info_T *ll_ref)
|
||||
if (win_split(0, flags) == FAIL) {
|
||||
return FAIL; // not enough room for window
|
||||
}
|
||||
p_swb = empty_option; // don't split again
|
||||
p_swb = (char_u *)empty_option; // don't split again
|
||||
swb_flags = 0;
|
||||
RESET_BINDING(curwin);
|
||||
if (ll_ref != NULL) {
|
||||
@@ -2994,7 +2994,7 @@ theend:
|
||||
qfl->qf_ptr = qf_ptr;
|
||||
qfl->qf_index = qf_index;
|
||||
}
|
||||
if (p_swb != (char_u *)old_swb && p_swb == empty_option) {
|
||||
if (p_swb != (char_u *)old_swb && p_swb == (char_u *)empty_option) {
|
||||
// Restore old 'switchbuf' value, but not when an autocommand or
|
||||
// modeline has changed the value.
|
||||
p_swb = (char_u *)old_swb;
|
||||
@@ -4183,7 +4183,7 @@ int grep_internal(cmdidx_T cmdidx)
|
||||
|| cmdidx == CMD_grepadd
|
||||
|| cmdidx == CMD_lgrepadd)
|
||||
&& STRCMP("internal",
|
||||
*curbuf->b_p_gp == NUL ? p_gp : curbuf->b_p_gp) == 0;
|
||||
*curbuf->b_p_gp == NUL ? p_gp : (char_u *)curbuf->b_p_gp) == 0;
|
||||
}
|
||||
|
||||
// Return the make/grep autocmd name.
|
||||
@@ -4241,7 +4241,7 @@ static char *make_get_fullcmd(const char *makecmd, const char *fname)
|
||||
// Used for ":make", ":lmake", ":grep", ":lgrep", ":grepadd", and ":lgrepadd"
|
||||
void ex_make(exarg_T *eap)
|
||||
{
|
||||
char *enc = (*curbuf->b_p_menc != NUL) ? (char *)curbuf->b_p_menc : (char *)p_menc;
|
||||
char *enc = (*curbuf->b_p_menc != NUL) ? curbuf->b_p_menc : (char *)p_menc;
|
||||
|
||||
// Redirect ":grep" to ":vimgrep" if 'grepprg' is "internal".
|
||||
if (grep_internal(eap->cmdidx)) {
|
||||
@@ -4981,7 +4981,7 @@ void ex_cfile(exarg_T *eap)
|
||||
set_string_option_direct("ef", -1, eap->arg, OPT_FREE, 0);
|
||||
}
|
||||
|
||||
char *enc = (*curbuf->b_p_menc != NUL) ? (char *)curbuf->b_p_menc : (char *)p_menc;
|
||||
char *enc = (*curbuf->b_p_menc != NUL) ? curbuf->b_p_menc : (char *)p_menc;
|
||||
|
||||
if (is_loclist_cmd(eap->cmdidx)) {
|
||||
wp = curwin;
|
||||
@@ -5305,7 +5305,7 @@ static int vgr_process_args(exarg_T *eap, vgr_args_T *args)
|
||||
}
|
||||
|
||||
// Parse the list of arguments, wildcards have already been expanded.
|
||||
if (get_arglist_exp((char_u *)p, &args->fcount, &args->fnames, true) == FAIL) {
|
||||
if (get_arglist_exp(p, &args->fcount, &args->fnames, true) == FAIL) {
|
||||
return FAIL;
|
||||
}
|
||||
if (args->fcount == 0) {
|
||||
@@ -5429,7 +5429,7 @@ static int vgr_process_files(win_T *wp, qf_info_T *qi, vgr_args_T *cmd_args, boo
|
||||
// options!
|
||||
aco_save_T aco;
|
||||
aucmd_prepbuf(&aco, buf);
|
||||
apply_autocmds(EVENT_FILETYPE, (char *)buf->b_p_ft, buf->b_fname, true, buf);
|
||||
apply_autocmds(EVENT_FILETYPE, buf->b_p_ft, buf->b_fname, true, buf);
|
||||
do_modelines(OPT_NOWIN);
|
||||
aucmd_restbuf(&aco);
|
||||
}
|
||||
@@ -7065,7 +7065,7 @@ void ex_helpgrep(exarg_T *eap)
|
||||
bool updated = false;
|
||||
// Make 'cpoptions' empty, the 'l' flag should not be used here.
|
||||
char *const save_cpo = p_cpo;
|
||||
p_cpo = (char *)empty_option;
|
||||
p_cpo = empty_option;
|
||||
|
||||
bool new_qi = false;
|
||||
if (is_loclist_cmd(eap->cmdidx)) {
|
||||
@@ -7096,7 +7096,7 @@ void ex_helpgrep(exarg_T *eap)
|
||||
updated = true;
|
||||
}
|
||||
|
||||
if ((char_u *)p_cpo == empty_option) {
|
||||
if (p_cpo == empty_option) {
|
||||
p_cpo = save_cpo;
|
||||
} else {
|
||||
// Darn, some plugin changed the value. If it's still empty it was
|
||||
@@ -7104,7 +7104,7 @@ void ex_helpgrep(exarg_T *eap)
|
||||
if (*p_cpo == NUL) {
|
||||
set_option_value_give_err("cpo", 0L, save_cpo, 0);
|
||||
}
|
||||
free_string_option((char_u *)save_cpo);
|
||||
free_string_option(save_cpo);
|
||||
}
|
||||
|
||||
if (updated) {
|
||||
|
Reference in New Issue
Block a user