mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-07 11:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: replace char_u variables and functions with char

Browse Source 
Work on https://github.com/neovim/neovim/issues/459
This commit is contained in:
Dundar Goc
2022-05-03 11:06:27 +02:00
parent 3ec93ca92c
commit 5576d30e89
42 changed files with 555 additions and 562 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/nvim/diff.c
View File

@@ -1186,9 +1186,9 @@ void ex_diffpatch(exarg_T *eap)
#ifdef UNIX
// Get the absolute path of the patchfile, changing directory below.
fullname = FullName_save((char *)eap->arg, false);
fullname = FullName_save(eap->arg, false);
esc_name =
vim_strsave_shellescape((fullname != NULL ? (char_u *)fullname : eap->arg), true, true);
vim_strsave_shellescape((char_u *)(fullname != NULL ? fullname : eap->arg), true, true);
#else
esc_name = vim_strsave_shellescape(eap->arg, true, true);
#endif
@@ -1219,7 +1219,7 @@ void ex_diffpatch(exarg_T *eap)
// Use 'patchexpr' to generate the new file.
#ifdef UNIX
eval_patch((char *)tmp_orig,
(fullname != NULL ? fullname : (char *)eap->arg),
(fullname != NULL ? fullname : eap->arg),
(char *)tmp_new);
#else
eval_patch((char *)tmp_orig, (char *)eap->arg, (char *)tmp_new);
@@ -1268,7 +1268,7 @@ void ex_diffpatch(exarg_T *eap)
if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) != FAIL) {
// Pretend it was a ":split fname" command
eap->cmdidx = CMD_split;
eap->arg = tmp_new;
eap->arg = (char *)tmp_new;
do_exedit(eap, old_curwin);
// check that split worked and editing tmp_new
@@ -1279,7 +1279,7 @@ void ex_diffpatch(exarg_T *eap)
if (newname != NULL) {
// do a ":file filename.new" on the patched buffer
eap->arg = newname;
eap->arg = (char *)newname;
ex_file(eap);
// Do filetype detection with the new name.
@@ -2469,10 +2469,10 @@ void nv_diffgetput(bool put, size_t count)
return;
}
if (count == 0) {
ea.arg = (char_u *)"";
ea.arg = "";
} else {
vim_snprintf(buf, sizeof(buf), "%zu", count);
ea.arg = (char_u *)buf;
ea.arg = buf;
}
if (put) {
@@ -2553,18 +2553,18 @@ void ex_diffgetput(exarg_T *eap)
}
} else {
// Buffer number or pattern given. Ignore trailing white space.
p = eap->arg + STRLEN(eap->arg);
while (p > eap->arg && ascii_iswhite(p[-1])) {
p = (char_u *)eap->arg + STRLEN(eap->arg);
while (p > (char_u *)eap->arg && ascii_iswhite(p[-1])) {
p--;
}
for (i = 0; ascii_isdigit(eap->arg[i]) && eap->arg + i < p; i++) {}
for (i = 0; ascii_isdigit(eap->arg[i]) && (char_u *)eap->arg + i < p; i++) {}
if (eap->arg + i == p) {
if ((char_u *)eap->arg + i == p) {
// digits only
i = (int)atol((char *)eap->arg);
i = (int)atol(eap->arg);
} else {
i = buflist_findpat(eap->arg, p, false, true, false);
i = buflist_findpat((char_u *)eap->arg, p, false, true, false);
if (i < 0) {
// error message already given