diff options
| author | Mark Bainter <mbainter+github@gmail.com> | 2015-04-20 15:28:37 +0000 |
|---|---|---|
| committer | Mark Bainter <mbainter+github@gmail.com> | 2015-05-06 21:34:19 -0500 |
| commit | c55e488079d3629fbfe16580262cd9a6f3d5eeae (patch) | |
| tree | 4652af8c5e68591a3527d42ab6f0350060d3b8b6 /src/nvim/os/env.c | |
| parent | 477b6a2c447dc10c068b13aab9a533a51c3284af (diff) | |
| download | rneovim-c55e488079d3629fbfe16580262cd9a6f3d5eeae.tar.gz rneovim-c55e488079d3629fbfe16580262cd9a6f3d5eeae.tar.bz2 rneovim-c55e488079d3629fbfe16580262cd9a6f3d5eeae.zip | |
Remove char_u: concat_fnames()
Diffstat (limited to 'src/nvim/os/env.c')
| -rw-r--r-- | src/nvim/os/env.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/nvim/os/env.c b/src/nvim/os/env.c index 2cf56f0201..4ea95691be 100644 --- a/src/nvim/os/env.c +++ b/src/nvim/os/env.c @@ -379,17 +379,20 @@ void expand_env_esc(char_u *srcp, char_u *dst, int dstlen, bool esc, bool one, /// @param vimdir directory to test static char *vim_version_dir(const char *vimdir) { - char_u *p; + char *p; - if (vimdir == NULL || *vimdir == NUL) + if (vimdir == NULL || *vimdir == NUL) { return NULL; - p = concat_fnames((char_u *)vimdir, (char_u *)VIM_VERSION_NODOT, true); - if (os_isdir(p)) - return (char *)p; + } + p = concat_fnames(vimdir, VIM_VERSION_NODOT, true); + if (os_isdir((char_u *)p)) { + return p; + } xfree(p); - p = concat_fnames((char_u *)vimdir, (char_u *)RUNTIME_DIRNAME, true); - if (os_isdir(p)) - return (char *)p; + p = concat_fnames(vimdir, RUNTIME_DIRNAME, true); + if (os_isdir((char_u *)p)) { + return p; + } xfree(p); return NULL; } |