diff options
| author | Eliseo Martínez <eliseomarmol@gmail.com> | 2015-05-07 08:08:31 +0200 |
|---|---|---|
| committer | Eliseo Martínez <eliseomarmol@gmail.com> | 2015-05-07 08:08:31 +0200 |
| commit | f88cec802169d94ad0a19d45746feac5fe2ea0fa (patch) | |
| tree | c87107941de9eab120e21df65e46432921c7aebe /src/nvim/quickfix.c | |
| parent | a2cf628603bf5948f96ceb90b653d2879a9d2f9e (diff) | |
| parent | 2f60a69bafc4b5130fb213df206179701ec0d74a (diff) | |
| download | rneovim-f88cec802169d94ad0a19d45746feac5fe2ea0fa.tar.gz rneovim-f88cec802169d94ad0a19d45746feac5fe2ea0fa.tar.bz2 rneovim-f88cec802169d94ad0a19d45746feac5fe2ea0fa.zip | |
Merge #2470: Remove char_u (5)
Reviewed-by: Scott Prager <splinterofchaos@gmail.com>
Reviewed-by: Michael Reed <m.reed@mykolab.com>
Reviewed-by: Eliseo Martínez <eliseomarmol@gmail.com>
Diffstat (limited to 'src/nvim/quickfix.c')
| -rw-r--r-- | src/nvim/quickfix.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c index a37a41caeb..7e22da6e7a 100644 --- a/src/nvim/quickfix.c +++ b/src/nvim/quickfix.c @@ -1085,7 +1085,7 @@ static int qf_get_fnum(char_u *directory, char_u *fname) slash_adjust(fname); #endif if (directory != NULL && !vim_isAbsName(fname)) { - ptr = concat_fnames(directory, fname, TRUE); + ptr = (char_u *)concat_fnames((char *)directory, (char *)fname, TRUE); /* * Here we check if the file really exists. * This should normally be true, but if make works without @@ -1096,7 +1096,7 @@ static int qf_get_fnum(char_u *directory, char_u *fname) xfree(ptr); directory = qf_guess_filepath(fname); if (directory) - ptr = concat_fnames(directory, fname, TRUE); + ptr = (char_u *)concat_fnames((char *)directory, (char *)fname, TRUE); else ptr = vim_strsave(fname); } @@ -1137,8 +1137,8 @@ static char_u *qf_push_dir(char_u *dirbuf, struct dir_stack_T **stackptr) (*stackptr)->dirname = NULL; while (ds_new) { xfree((*stackptr)->dirname); - (*stackptr)->dirname = concat_fnames(ds_new->dirname, dirbuf, - TRUE); + (*stackptr)->dirname = (char_u *)concat_fnames((char *)ds_new->dirname, + (char *)dirbuf, TRUE); if (os_isdir((*stackptr)->dirname)) break; @@ -1242,7 +1242,7 @@ static char_u *qf_guess_filepath(char_u *filename) fullname = NULL; while (ds_ptr) { xfree(fullname); - fullname = concat_fnames(ds_ptr->dirname, filename, TRUE); + fullname = (char_u *)concat_fnames((char *)ds_ptr->dirname, (char *)filename, TRUE); if (os_file_exists(fullname)) break; @@ -3546,7 +3546,7 @@ void ex_helpgrep(exarg_T *eap) copy_option_part(&p, NameBuff, MAXPATHL, ","); /* Find all "*.txt" and "*.??x" files in the "doc" directory. */ - add_pathsep(NameBuff); + add_pathsep((char *)NameBuff); STRCAT(NameBuff, "doc/*.\\(txt\\|??x\\)"); // Note: We cannot just do `&NameBuff` because it is a statically sized array |