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>

1 files changed, 10 insertions, 9 deletions

diff --git a/src/nvim/os/env.c b/src/nvim/os/env.c
index 2cf56f0201..fd115ab2b3 100644
--- a/src/nvim/os/env.c
+++ b/src/nvim/os/env.c
@@ -379,17 +379,18 @@ 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;
-
-  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;
+  }
+  char *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;
 }