From c55e488079d3629fbfe16580262cd9a6f3d5eeae Mon Sep 17 00:00:00 2001 From: Mark Bainter Date: Mon, 20 Apr 2015 15:28:37 +0000 Subject: Remove char_u: concat_fnames() --- src/nvim/os/env.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'src/nvim/os') 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; } -- cgit