IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

remove char_u: vim_version_dir #2414

Browse Source 
See: #459
This commit is contained in:
Mark Bainter 2015-04-12 14:53:33 +00:00 committed by Justin M. Keyes
parent 917ba54ff5
commit 0248c75bc1
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/nvim/os/env.c
View File

@ -371,19 +371,19 @@ void expand_env_esc(char_u *srcp, char_u *dst, int dstlen, bool esc, bool one,
/// Check if the directory "vimdir/<version>" or "vimdir/runtime" exists. /// Check if the directory "vimdir/<version>" or "vimdir/runtime" exists.
/// Return NULL if not, return its name in allocated memory otherwise. /// Return NULL if not, return its name in allocated memory otherwise.
/// @param vimdir directory to test /// @param vimdir directory to test
static char_u *vim_version_dir(char_u *vimdir) static char *vim_version_dir(char *vimdir)
{ {
char_u *p; char_u *p;
if (vimdir == NULL || *vimdir == NUL) if (vimdir == NULL || *vimdir == NUL)
return NULL; return NULL;
p = concat_fnames(vimdir, (char_u *)VIM_VERSION_NODOT, true); p = concat_fnames((char_u *)vimdir, (char_u *)VIM_VERSION_NODOT, true);
if (os_isdir(p)) if (os_isdir(p))
return p; return (char *)p;
free(p); free(p);
p = concat_fnames(vimdir, (char_u *)RUNTIME_DIRNAME, true); p = concat_fnames((char_u *)vimdir, (char_u *)RUNTIME_DIRNAME, true);
if (os_isdir(p)) if (os_isdir(p))
return p; return (char *)p;
free(p); free(p);
return NULL; return NULL;
} }
@ -442,7 +442,7 @@ char_u *vim_getenv(char_u *name, bool *mustfree)
if (p != NULL && *p == NUL) /* empty is the same as not set */ if (p != NULL && *p == NUL) /* empty is the same as not set */
p = NULL; p = NULL;
if (p != NULL) { if (p != NULL) {
p = vim_version_dir(p); p = (char_u *)vim_version_dir((char *)p);
if (p != NULL) if (p != NULL)
*mustfree = true; *mustfree = true;
else else
@ -501,7 +501,7 @@ char_u *vim_getenv(char_u *name, bool *mustfree)
*mustfree = false; *mustfree = false;
} else if (*default_vim_dir != NUL) { } else if (*default_vim_dir != NUL) {
if (vimruntime if (vimruntime
&& (p = vim_version_dir((char_u *)default_vim_dir)) != NULL) { && (p = (char_u *)vim_version_dir(default_vim_dir)) != NULL) {
*mustfree = true; *mustfree = true;
} else { } else {
p = (char_u *)default_vim_dir; p = (char_u *)default_vim_dir;