mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-07 10:26:31 +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 f078a3453a
commit bd51ac2a34
26 changed files with 492 additions and 509 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/nvim/debugger.c
View File

@@ -33,7 +33,7 @@ static char *debug_newval = NULL;
struct debuggy {
int dbg_nr; ///< breakpoint number
int dbg_type; ///< DBG_FUNC or DBG_FILE or DBG_EXPR
char_u *dbg_name; ///< function, expression or file name
char *dbg_name; ///< function, expression or file name
regprog_T *dbg_prog; ///< regexp program
linenr_T dbg_lnum; ///< line number in function or file
int dbg_forceit; ///< ! used
@@ -60,7 +60,7 @@ void do_debug(char *cmd)
bool typeahead_saved = false;
int save_ignore_script = 0;
int n;
char_u *cmdline = NULL;
char *cmdline = NULL;
char *p;
char *tail = NULL;
static int last_cmd = 0;
@@ -129,8 +129,8 @@ void do_debug(char *cmd)
}
xfree(cmdline);
cmdline = (char_u *)getcmdline_prompt('>', NULL, 0, EXPAND_NOTHING, NULL,
CALLBACK_NONE);
cmdline = getcmdline_prompt('>', NULL, 0, EXPAND_NOTHING, NULL,
CALLBACK_NONE);
if (typeahead_saved) {
restore_typeahead(&typeaheadbuf);
@@ -144,7 +144,7 @@ void do_debug(char *cmd)
// If this is a debug command, set "last_cmd".
// If not, reset "last_cmd".
// For a blank line use previous command.
p = skipwhite((char *)cmdline);
p = skipwhite(cmdline);
if (*p != NUL) {
switch (*p) {
case 'c':
@@ -239,14 +239,14 @@ void do_debug(char *cmd)
last_cmd = CMD_STEP;
break;
case CMD_BACKTRACE:
do_showbacktrace((char_u *)cmd);
do_showbacktrace(cmd);
continue;
case CMD_FRAME:
if (*p == NUL) {
do_showbacktrace((char_u *)cmd);
do_showbacktrace(cmd);
} else {
p = skipwhite(p);
do_setdebugtracelevel((char_u *)p);
do_setdebugtracelevel(p);
}
continue;
case CMD_UP:
@@ -266,7 +266,7 @@ void do_debug(char *cmd)
// don't debug this command
n = debug_break_level;
debug_break_level = -1;
(void)do_cmdline((char *)cmdline, getexline, NULL, DOCMD_VERBOSE|DOCMD_EXCRESET);
(void)do_cmdline(cmdline, getexline, NULL, DOCMD_VERBOSE|DOCMD_EXCRESET);
debug_break_level = n;
}
lines_left = Rows - 1;
@@ -306,9 +306,9 @@ static int get_maxbacktrace_level(char *sname)
return maxbacktrace;
}
static void do_setdebugtracelevel(char_u *arg)
static void do_setdebugtracelevel(char *arg)
{
int level = atoi((char *)arg);
int level = atoi(arg);
if (*arg == '+' || level < 0) {
debug_backtrace_level += level;
} else {
@@ -335,7 +335,7 @@ static void do_checkbacktracelevel(void)
}
}
static void do_showbacktrace(char_u *cmd)
static void do_showbacktrace(char *cmd)
{
char *sname = estack_sfile(ESTACK_NONE);
int max = get_maxbacktrace_level(sname);
@@ -470,7 +470,7 @@ static typval_T *eval_expr_no_emsg(struct debuggy *const bp)
{
// Disable error messages, a bad expression would make Vim unusable.
emsg_off++;
typval_T *const tv = eval_expr((char *)bp->dbg_name);
typval_T *const tv = eval_expr(bp->dbg_name);
emsg_off--;
return tv;
}
@@ -482,9 +482,9 @@ static typval_T *eval_expr_no_emsg(struct debuggy *const bp)
///
/// @param arg
/// @param gap either &dbg_breakp or &prof_ga
static int dbg_parsearg(char_u *arg, garray_T *gap)
static int dbg_parsearg(char *arg, garray_T *gap)
{
char *p = (char *)arg;
char *p = arg;
char *q;
bool here = false;
@@ -531,11 +531,11 @@ static int dbg_parsearg(char_u *arg, garray_T *gap)
}
if (bp->dbg_type == DBG_FUNC) {
bp->dbg_name = vim_strsave((char_u *)p);
bp->dbg_name = xstrdup(p);
} else if (here) {
bp->dbg_name = vim_strsave((char_u *)curbuf->b_ffname);
bp->dbg_name = xstrdup(curbuf->b_ffname);
} else if (bp->dbg_type == DBG_EXPR) {
bp->dbg_name = vim_strsave((char_u *)p);
bp->dbg_name = xstrdup(p);
bp->dbg_val = eval_expr_no_emsg(bp);
} else {
// Expand the file name in the same way as do_source(). This means
@@ -551,10 +551,10 @@ static int dbg_parsearg(char_u *arg, garray_T *gap)
return FAIL;
}
if (*p != '*') {
bp->dbg_name = (char_u *)fix_fname(p);
bp->dbg_name = fix_fname(p);
xfree(p);
} else {
bp->dbg_name = (char_u *)p;
bp->dbg_name = p;
}
}
@@ -572,12 +572,12 @@ void ex_breakadd(exarg_T *eap)
gap = &prof_ga;
}
if (dbg_parsearg((char_u *)eap->arg, gap) == OK) {
if (dbg_parsearg(eap->arg, gap) == OK) {
struct debuggy *bp = &DEBUGGY(gap, gap->ga_len);
bp->dbg_forceit = eap->forceit;
if (bp->dbg_type != DBG_EXPR) {
char *pat = file_pat_to_reg_pat((char *)bp->dbg_name, NULL, NULL, false);
char *pat = file_pat_to_reg_pat(bp->dbg_name, NULL, NULL, false);
if (pat != NULL) {
bp->dbg_prog = vim_regcomp(pat, RE_MAGIC + RE_STRING);
xfree(pat);
@@ -639,7 +639,7 @@ void ex_breakdel(exarg_T *eap)
del_all = true;
} else {
// ":breakdel {func|file|expr} [lnum] {name}"
if (dbg_parsearg((char_u *)eap->arg, gap) == FAIL) {
if (dbg_parsearg(eap->arg, gap) == FAIL) {
return;
}
bp = &DEBUGGY(gap, gap->ga_len);
@@ -697,13 +697,13 @@ void ex_breaklist(exarg_T *eap)
for (int i = 0; i < dbg_breakp.ga_len; i++) {
struct debuggy *bp = &BREAKP(i);
if (bp->dbg_type == DBG_FILE) {
home_replace(NULL, (char *)bp->dbg_name, (char *)NameBuff, MAXPATHL, true);
home_replace(NULL, bp->dbg_name, (char *)NameBuff, MAXPATHL, true);
}
if (bp->dbg_type != DBG_EXPR) {
smsg(_("%3d %s %s line %" PRId64),
bp->dbg_nr,
bp->dbg_type == DBG_FUNC ? "func" : "file",
bp->dbg_type == DBG_FUNC ? bp->dbg_name : (char_u *)NameBuff,
bp->dbg_type == DBG_FUNC ? bp->dbg_name : NameBuff,
(int64_t)bp->dbg_lnum);
} else {
smsg(_("%3d expr %s"), bp->dbg_nr, bp->dbg_name);