Refactor default_vim{,runtime}_dir to use char type. neovim#2375

See: neovim#459 Reviewed-by: Justin M. Keyes <justinkz@gmail.com> Reviewed-by: Eliseo Martínez <eliseomarmol@gmail.com>
Shougo · Apr 20, 2015 · ea3d9fa · ea3d9fa
1 parent 487d238
commit ea3d9fa
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/config/pathdef.c.in b/config/pathdef.c.in
@@ -1,5 +1,5 @@
 #include "${PROJECT_SOURCE_DIR}/src/nvim/vim.h"
-char_u *default_vim_dir = (char_u *)"${CMAKE_INSTALL_PREFIX}/share/nvim";
-char_u *default_vimruntime_dir = (char_u *)"";
+char *default_vim_dir = "${CMAKE_INSTALL_PREFIX}/share/nvim";
+char *default_vimruntime_dir = "";
 char_u *compiled_user = (char_u *)"${USERNAME}";
 char_u *compiled_sys = (char_u *)"${HOSTNAME}";
diff --git a/src/nvim/globals.h b/src/nvim/globals.h
@@ -982,8 +982,8 @@ EXTERN char breakat_flags[256];         /* which characters are in 'breakat' */
  * Makefile to make their value depend on the Makefile.
  */
 #ifdef HAVE_PATHDEF
-extern char_u *default_vim_dir;
-extern char_u *default_vimruntime_dir;
+extern char *default_vim_dir;
+extern char *default_vimruntime_dir;
 extern char_u *compiled_user;
 extern char_u *compiled_sys;
 #endif

diff --git a/src/nvim/os/env.c b/src/nvim/os/env.c
@@ -495,13 +495,14 @@ char_u *vim_getenv(char_u *name, bool *mustfree)
   if (p == NULL) {
     /* Only use default_vimruntime_dir when it is not empty */
     if (vimruntime && *default_vimruntime_dir != NUL) {
-      p = default_vimruntime_dir;
+      p = (char_u *)default_vimruntime_dir;
       *mustfree = false;
     } else if (*default_vim_dir != NUL) {
-      if (vimruntime && (p = vim_version_dir(default_vim_dir)) != NULL) {
+      if (vimruntime
+          && (p = vim_version_dir((char_u *)default_vim_dir)) != NULL) {
         *mustfree = true;
       } else {
-        p = default_vim_dir;
+        p = (char_u *)default_vim_dir;
         *mustfree = false;
       }
     }

diff --git a/src/nvim/version.c b/src/nvim/version.c
@@ -915,13 +915,13 @@ void list_version(void)
 
   if (*default_vim_dir != NUL) {
     version_msg(_("  fall-back for $VIM: \""));
-    version_msg((char *)default_vim_dir);
+    version_msg(default_vim_dir);
     version_msg("\"\n");
   }
 
   if (*default_vimruntime_dir != NUL) {
     version_msg(_(" f-b for $VIMRUNTIME: \""));
-    version_msg((char *)default_vimruntime_dir);
+    version_msg(default_vimruntime_dir);
     version_msg("\"\n");
   }
 #endif  // ifdef HAVE_PATHDEF