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

refactor: replace char_u with char

Browse Source 
Work on https://github.com/neovim/neovim/issues/459
This commit is contained in:
Dundar Göc
2022-08-26 23:11:25 +02:00
committed by dundargoc
parent 87e037e26c
commit 73207cae61
76 changed files with 868 additions and 883 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/nvim/ops.c
View File

@@ -722,26 +722,26 @@ int get_expr_register(void)
if (*new_line == NUL) { // use previous line
xfree(new_line);
} else {
set_expr_line(new_line);
set_expr_line((char *)new_line);
}
return '=';
}
/// Set the expression for the '=' register.
/// Argument must be an allocated string.
void set_expr_line(char_u *new_line)
void set_expr_line(char *new_line)
{
xfree(expr_line);
expr_line = new_line;
expr_line = (char_u *)new_line;
}
/// Get the result of the '=' register expression.
///
/// @return a pointer to allocated memory, or NULL for failure.
char_u *get_expr_line(void)
char *get_expr_line(void)
{
char_u *expr_copy;
char_u *rv;
char *expr_copy;
char *rv;
static int nested = 0;
if (expr_line == NULL) {
@@ -750,7 +750,7 @@ char_u *get_expr_line(void)
// Make a copy of the expression, because evaluating it may cause it to be
// changed.
expr_copy = vim_strsave(expr_line);
expr_copy = xstrdup((char *)expr_line);
// When we are invoked recursively limit the evaluation to 10 levels.
// Then return the string as-is.
@@ -759,19 +759,19 @@ char_u *get_expr_line(void)
}
nested++;
rv = (char_u *)eval_to_string((char *)expr_copy, NULL, true);
rv = eval_to_string(expr_copy, NULL, true);
nested--;
xfree(expr_copy);
return rv;
}
/// Get the '=' register expression itself, without evaluating it.
char_u *get_expr_line_src(void)
char *get_expr_line_src(void)
{
if (expr_line == NULL) {
return NULL;
}
return vim_strsave(expr_line);
return xstrdup((char *)expr_line);
}
/// @return whether `regname` is a valid name of a yank register.
@@ -1070,11 +1070,11 @@ static char_u *execreg_line_continuation(char **lines, size_t *idx)
}
}
ga_append(&ga, NUL);
char_u *str = vim_strsave(ga.ga_data);
char *str = xstrdup(ga.ga_data);
ga_clear(&ga);
*idx = i;
return str;
return (char_u *)str;
}
/// Execute a yank register: copy it into the stuff buffer
@@ -1130,7 +1130,7 @@ int do_execreg(int regname, int colon, int addcr, int silent)
}
xfree(p);
} else if (regname == '=') {
p = get_expr_line();
p = (char_u *)get_expr_line();
if (p == NULL) {
return FAIL;
}
@@ -1338,7 +1338,7 @@ bool get_spec_reg(int regname, char **argp, bool *allocated, bool errmsg)
return true;
case '=': // result of expression
*argp = (char *)get_expr_line();
*argp = get_expr_line();
*allocated = true;
return true;
@@ -1392,7 +1392,7 @@ bool get_spec_reg(int regname, char **argp, bool *allocated, bool errmsg)
return false;
}
*argp = (char *)ml_get_buf(curwin->w_buffer, curwin->w_cursor.lnum, false);
*argp = ml_get_buf(curwin->w_buffer, curwin->w_cursor.lnum, false);
return true;
case '_': // black hole: always empty
@@ -1801,7 +1801,7 @@ static void mb_adjust_opend(oparg_T *oap)
static inline void pbyte(pos_T lp, int c)
{
assert(c <= UCHAR_MAX);
*(ml_get_buf(curbuf, lp.lnum, true) + lp.col) = (char_u)c;
*(ml_get_buf(curbuf, lp.lnum, true) + lp.col) = (char)c;
if (!curbuf_splice_pending) {
extmark_splice_cols(curbuf, (int)lp.lnum - 1, lp.col, 1, 1, kExtmarkUndo);
}
@@ -1978,7 +1978,7 @@ static int op_replace(oparg_T *oap, int c)
n = gchar_cursor();
if (n != NUL) {
int new_byte_len = utf_char2len(c);
int old_byte_len = utfc_ptr2len((char *)get_cursor_pos_ptr());
int old_byte_len = utfc_ptr2len(get_cursor_pos_ptr());
if (new_byte_len > 1 || old_byte_len > 1) {
// This is slow, but it handles replacing a single-byte
@@ -2199,7 +2199,7 @@ bool swapchar(int op_type, pos_T *pos)
curwin->w_cursor = *pos;
// don't use del_char(), it also removes composing chars
del_bytes(utf_ptr2len((char *)get_cursor_pos_ptr()), false, false);
del_bytes(utf_ptr2len(get_cursor_pos_ptr()), false, false);
ins_char(nc);
curwin->w_cursor = sp;
} else {
@@ -2995,7 +2995,7 @@ void do_put(int regname, yankreg_T *reg, int dir, long count, int flags)
// STRLEN(ml_get(curwin->w_cursor.lnum)). With 'virtualedit' and the
// cursor past the end of the line, curwin->w_cursor.coladd is
// incremented instead of curwin->w_cursor.col.
char_u *cursor_pos = get_cursor_pos_ptr();
char_u *cursor_pos = (char_u *)get_cursor_pos_ptr();
bool one_past_line = (*cursor_pos == NUL);
bool eol = false;
if (!one_past_line) {
@@ -3101,7 +3101,7 @@ void do_put(int regname, yankreg_T *reg, int dir, long count, int flags)
if (u_save_cursor() == FAIL) {
goto end;
}
char *p = (char *)get_cursor_pos_ptr();
char *p = get_cursor_pos_ptr();
if (dir == FORWARD && *p != NUL) {
MB_PTR_ADV(p);
}
@@ -3210,7 +3210,7 @@ void do_put(int regname, yankreg_T *reg, int dir, long count, int flags)
}
// move to start of next multi-byte character
curwin->w_cursor.col += utfc_ptr2len((char *)get_cursor_pos_ptr());
curwin->w_cursor.col += utfc_ptr2len(get_cursor_pos_ptr());
col++;
} else {
getvcol(curwin, &curwin->w_cursor, &col, NULL, &endcol2);
@@ -3393,7 +3393,7 @@ void do_put(int regname, yankreg_T *reg, int dir, long count, int flags)
// if type is kMTCharWise, FORWARD is the same as BACKWARD on the next
// char
if (dir == FORWARD && gchar_cursor() != NUL) {
int bytelen = utfc_ptr2len((char *)get_cursor_pos_ptr());
int bytelen = utfc_ptr2len(get_cursor_pos_ptr());
// put it on the next of the multi-byte character.
col += bytelen;
@@ -4853,13 +4853,13 @@ void format_reg_type(MotionType reg_type, colnr_T reg_width, char *buf, size_t b
/// Otherwise just return `s`.
///
/// @return a void * for use in get_reg_contents().
static void *get_reg_wrap_one_line(char_u *s, int flags)
static void *get_reg_wrap_one_line(char *s, int flags)
{
if (!(flags & kGRegList)) {
return s;
}
list_T *const list = tv_list_alloc(1);
tv_list_append_allocated_string(list, (char *)s);
tv_list_append_allocated_string(list, s);
return list;
}
@@ -4901,9 +4901,9 @@ void *get_reg_contents(int regname, int flags)
return NULL;
}
if (allocated) {
return get_reg_wrap_one_line((char_u *)retval, flags);
return get_reg_wrap_one_line(retval, flags);
}
return get_reg_wrap_one_line(vim_strsave((char_u *)retval), flags);
return get_reg_wrap_one_line(xstrdup(retval), flags);
}
yankreg_T *reg = get_yank_register(regname, YREG_PASTE);
@@ -5574,7 +5574,7 @@ static Callback opfunc_cb;
/// @return OK or FAIL
int set_operatorfunc_option(void)
{
return option_set_callback_func((char_u *)p_opfunc, &opfunc_cb);
return option_set_callback_func(p_opfunc, &opfunc_cb);
}
#if defined(EXITFREE)