mirror of
https://github.com/neovim/neovim.git
synced 2025-10-04 17:06:30 +00:00
refactor: replace char_u with char
Work on https://github.com/neovim/neovim/issues/459
This commit is contained in:
@@ -194,8 +194,8 @@ int did_set_spelltab;
|
||||
char *e_format = N_("E759: Format error in spell file");
|
||||
|
||||
// Remember what "z?" replaced.
|
||||
char_u *repl_from = NULL;
|
||||
char_u *repl_to = NULL;
|
||||
char *repl_from = NULL;
|
||||
char *repl_to = NULL;
|
||||
|
||||
/// Main spell-checking function.
|
||||
/// "ptr" points to a character that could be the start of a word.
|
||||
@@ -1275,7 +1275,7 @@ size_t spell_move_to(win_T *wp, int dir, bool allwords, bool curline, hlf_T *att
|
||||
decor_spell_nav_start(wp);
|
||||
|
||||
while (!got_int) {
|
||||
char_u *line = ml_get_buf(wp->w_buffer, lnum, false);
|
||||
char_u *line = (char_u *)ml_get_buf(wp->w_buffer, lnum, false);
|
||||
|
||||
len = STRLEN(line);
|
||||
if (buflen < len + MAXWLEN + 2) {
|
||||
@@ -1302,7 +1302,7 @@ size_t spell_move_to(win_T *wp, int dir, bool allwords, bool curline, hlf_T *att
|
||||
|
||||
// Need to get the line again, may have looked at the previous
|
||||
// one.
|
||||
line = ml_get_buf(wp->w_buffer, lnum, false);
|
||||
line = (char_u *)ml_get_buf(wp->w_buffer, lnum, false);
|
||||
}
|
||||
|
||||
// Copy the line into "buf" and append the start of the next line if
|
||||
@@ -1312,7 +1312,7 @@ size_t spell_move_to(win_T *wp, int dir, bool allwords, bool curline, hlf_T *att
|
||||
STRCPY(buf, line);
|
||||
if (lnum < wp->w_buffer->b_ml.ml_line_count) {
|
||||
spell_cat_line(buf + STRLEN(buf),
|
||||
ml_get_buf(wp->w_buffer, lnum + 1, false),
|
||||
(char_u *)ml_get_buf(wp->w_buffer, lnum + 1, false),
|
||||
MAXWLEN);
|
||||
}
|
||||
char_u *p = buf + skip;
|
||||
@@ -1573,15 +1573,15 @@ static void int_wordlist_spl(char_u *fname)
|
||||
int_wordlist, spell_enc());
|
||||
}
|
||||
|
||||
// Allocate a new slang_T for language "lang". "lang" can be NULL.
|
||||
// Caller must fill "sl_next".
|
||||
slang_T *slang_alloc(char_u *lang)
|
||||
/// Allocate a new slang_T for language "lang". "lang" can be NULL.
|
||||
/// Caller must fill "sl_next".
|
||||
slang_T *slang_alloc(char *lang)
|
||||
FUNC_ATTR_NONNULL_RET
|
||||
{
|
||||
slang_T *lp = xcalloc(1, sizeof(slang_T));
|
||||
|
||||
if (lang != NULL) {
|
||||
lp->sl_name = vim_strsave(lang);
|
||||
lp->sl_name = xstrdup(lang);
|
||||
}
|
||||
ga_init(&lp->sl_rep, sizeof(fromto_T), 10);
|
||||
ga_init(&lp->sl_repsal, sizeof(fromto_T), 10);
|
||||
@@ -1693,7 +1693,7 @@ void slang_clear_sug(slang_T *lp)
|
||||
static void spell_load_cb(char *fname, void *cookie)
|
||||
{
|
||||
spelload_T *slp = (spelload_T *)cookie;
|
||||
slang_T *slang = spell_load_file((char_u *)fname, slp->sl_lang, NULL, false);
|
||||
slang_T *slang = spell_load_file(fname, (char *)slp->sl_lang, NULL, false);
|
||||
if (slang != NULL) {
|
||||
// When a previously loaded file has NOBREAK also use it for the
|
||||
// ".add" files.
|
||||
@@ -1861,7 +1861,7 @@ char *did_set_spelllang(win_T *wp)
|
||||
langp_T *lp, *lp2;
|
||||
static bool recursive = false;
|
||||
char *ret_msg = NULL;
|
||||
char_u *spl_copy;
|
||||
char *spl_copy;
|
||||
|
||||
bufref_T bufref;
|
||||
set_bufref(&bufref, wp->w_buffer);
|
||||
@@ -1879,12 +1879,12 @@ char *did_set_spelllang(win_T *wp)
|
||||
|
||||
// Make a copy of 'spelllang', the SpellFileMissing autocommands may change
|
||||
// it under our fingers.
|
||||
spl_copy = vim_strsave((char_u *)wp->w_s->b_p_spl);
|
||||
spl_copy = xstrdup(wp->w_s->b_p_spl);
|
||||
|
||||
wp->w_s->b_cjk = 0;
|
||||
|
||||
// Loop over comma separated language names.
|
||||
for (splp = (char *)spl_copy; *splp != NUL;) {
|
||||
for (splp = spl_copy; *splp != NUL;) {
|
||||
// Get one language name.
|
||||
copy_option_part(&splp, (char *)lang, MAXWLEN, ",");
|
||||
region = NULL;
|
||||
@@ -1952,7 +1952,7 @@ char *did_set_spelllang(win_T *wp)
|
||||
// If not found try loading the language now.
|
||||
if (slang == NULL) {
|
||||
if (filename) {
|
||||
(void)spell_load_file(lang, lang, NULL, false);
|
||||
(void)spell_load_file((char *)lang, (char *)lang, NULL, false);
|
||||
} else {
|
||||
spell_load_lang(lang);
|
||||
// SpellFileMissing autocommands may do anything, including
|
||||
@@ -2054,7 +2054,7 @@ char *did_set_spelllang(win_T *wp)
|
||||
*p = NUL; // truncate at ".encoding.add"
|
||||
}
|
||||
}
|
||||
slang = spell_load_file(spf_name, lang, NULL, true);
|
||||
slang = spell_load_file((char *)spf_name, (char *)lang, NULL, true);
|
||||
|
||||
// If one of the languages has NOBREAK we assume the addition
|
||||
// files also have this.
|
||||
|
Reference in New Issue
Block a user