mirror of
https://github.com/neovim/neovim.git
synced 2025-10-15 06:16:08 +00:00
refactor: replace char_u with char
Work on https://github.com/neovim/neovim/issues/459
This commit is contained in:
@@ -652,7 +652,7 @@ static char_u *ins_compl_infercase_gettext(char_u *str, int char_len, int compl_
|
||||
ga_grow(&gap, IOSIZE);
|
||||
*p = NUL;
|
||||
STRCPY(gap.ga_data, IObuff);
|
||||
gap.ga_len = (int)STRLEN(IObuff);
|
||||
gap.ga_len = (int)strlen(IObuff);
|
||||
} else {
|
||||
p += utf_char2bytes(wca[i++], p);
|
||||
}
|
||||
@@ -775,7 +775,7 @@ static int ins_compl_add(char *const str, int len, char *const fname, char *cons
|
||||
return FAIL;
|
||||
}
|
||||
if (len < 0) {
|
||||
len = (int)STRLEN(str);
|
||||
len = (int)strlen(str);
|
||||
}
|
||||
|
||||
// If the same match is already present, don't add it.
|
||||
@@ -784,7 +784,7 @@ static int ins_compl_add(char *const str, int len, char *const fname, char *cons
|
||||
do {
|
||||
if (!match_at_original_text(match)
|
||||
&& STRNCMP(match->cp_str, str, len) == 0
|
||||
&& ((int)STRLEN(match->cp_str) <= len || match->cp_str[len] == NUL)) {
|
||||
&& ((int)strlen(match->cp_str) <= len || match->cp_str[len] == NUL)) {
|
||||
FREE_CPTEXT(cptext, cptext_allocated);
|
||||
return NOTDONE;
|
||||
}
|
||||
@@ -997,7 +997,7 @@ bool ins_compl_has_shown_match(void)
|
||||
bool ins_compl_long_shown_match(void)
|
||||
{
|
||||
return compl_shown_match != NULL && compl_shown_match->cp_str != NULL
|
||||
&& (colnr_T)STRLEN(compl_shown_match->cp_str) > curwin->w_cursor.col - compl_col;
|
||||
&& (colnr_T)strlen(compl_shown_match->cp_str) > curwin->w_cursor.col - compl_col;
|
||||
}
|
||||
|
||||
/// Set variables that store noselect and noinsert behavior from the
|
||||
@@ -1124,7 +1124,7 @@ static int ins_compl_build_pum(void)
|
||||
XFREE_CLEAR(compl_leader);
|
||||
}
|
||||
|
||||
const int lead_len = compl_leader != NULL ? (int)STRLEN(compl_leader) : 0;
|
||||
const int lead_len = compl_leader != NULL ? (int)strlen(compl_leader) : 0;
|
||||
|
||||
do {
|
||||
if (!match_at_original_text(compl)
|
||||
@@ -2724,7 +2724,7 @@ static int process_next_cpt_value(ins_compl_next_state_T *st, int *compl_type_ar
|
||||
// buffer, so that word at start of buffer is found
|
||||
// correctly.
|
||||
st->first_match_pos.lnum = st->ins_buf->b_ml.ml_line_count;
|
||||
st->first_match_pos.col = (colnr_T)STRLEN(ml_get(st->first_match_pos.lnum));
|
||||
st->first_match_pos.col = (colnr_T)strlen(ml_get(st->first_match_pos.lnum));
|
||||
}
|
||||
st->last_match_pos = st->first_match_pos;
|
||||
compl_type = 0;
|
||||
@@ -2806,7 +2806,7 @@ done:
|
||||
static void get_next_include_file_completion(int compl_type)
|
||||
{
|
||||
find_pattern_in_path((char_u *)compl_pattern, compl_direction,
|
||||
STRLEN(compl_pattern), false, false,
|
||||
strlen(compl_pattern), false, false,
|
||||
((compl_type == CTRL_X_PATH_DEFINES
|
||||
&& !(compl_cont_status & CONT_SOL))
|
||||
? FIND_DEFINE : FIND_ANY),
|
||||
@@ -2889,7 +2889,7 @@ static void get_next_cmdline_completion(void)
|
||||
char **matches;
|
||||
int num_matches;
|
||||
if (expand_cmdline(&compl_xp, (char_u *)compl_pattern,
|
||||
(int)STRLEN(compl_pattern),
|
||||
(int)strlen(compl_pattern),
|
||||
&num_matches, &matches) == EXPAND_OK) {
|
||||
ins_compl_add_matches(num_matches, matches, false);
|
||||
}
|
||||
@@ -3810,7 +3810,7 @@ static int get_filename_compl_info(char_u *line, int startcol, colnr_T curs_col)
|
||||
static int get_cmdline_compl_info(char *line, colnr_T curs_col)
|
||||
{
|
||||
compl_pattern = xstrnsave(line, (size_t)curs_col);
|
||||
set_cmd_context(&compl_xp, (char_u *)compl_pattern, (int)STRLEN(compl_pattern), curs_col, false);
|
||||
set_cmd_context(&compl_xp, (char_u *)compl_pattern, (int)strlen(compl_pattern), curs_col, false);
|
||||
if (compl_xp.xp_context == EXPAND_UNSUCCESSFUL
|
||||
|| compl_xp.xp_context == EXPAND_NOTHING) {
|
||||
// No completion possible, use an empty pattern to get a
|
||||
|
Reference in New Issue
Block a user