diff options
| author | Mark Bainter <mbainter+github@gmail.com> | 2015-04-08 14:39:44 +0000 |
|---|---|---|
| committer | Eliseo Martínez <eliseomarmol@gmail.com> | 2015-04-12 10:52:51 +0200 |
| commit | 675e363316ea8e78d461d23ca848790c52d0c62e (patch) | |
| tree | 6224ffccb6d70ccfc968867912459855210d6c53 | |
| parent | ecc28fb2dd43551f349a071f9597cf7033f306f7 (diff) | |
| download | rneovim-675e363316ea8e78d461d23ca848790c52d0c62e.tar.gz rneovim-675e363316ea8e78d461d23ca848790c52d0c62e.tar.bz2 rneovim-675e363316ea8e78d461d23ca848790c52d0c62e.zip | |
Refactor default_vim{,runtime}_dir to use char type. #2375
See: #459
Reviewed-by: Justin M. Keyes <justinkz@gmail.com>
Reviewed-by: Eliseo Martínez <eliseomarmol@gmail.com>
| -rw-r--r-- | config/pathdef.c.in | 4 | ||||
| -rw-r--r-- | src/nvim/globals.h | 4 | ||||
| -rw-r--r-- | src/nvim/os/env.c | 7 | ||||
| -rw-r--r-- | src/nvim/version.c | 4 |
4 files changed, 10 insertions, 9 deletions
diff --git a/config/pathdef.c.in b/config/pathdef.c.in index b30bcfd3f1..faf4267ce8 100644 --- 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 index 9eb70d37df..a8c97c800d 100644 --- 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 index 30e44341a9..52c3e0d9cd 100644 --- 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 index 1a5eb523fa..49f374bce4 100644 --- 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 |