mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-11-14 14:29:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

main,os/env: Fix lint errors

Browse Source
This commit is contained in:
ZyX
2015-10-17 19:41:03 +03:00
parent 2018389871
commit 89a10b3e7c
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/main.c
View File

@@ -1835,10 +1835,10 @@ static void source_startup_scripts(mparm_T *parmp)
char_u *user_vimrc = (char_u *)stdpaths_user_conf_subpath("init.vim"); char_u *user_vimrc = (char_u *)stdpaths_user_conf_subpath("init.vim");
if (process_env("VIMINIT", true) != OK) { if (process_env("VIMINIT", true) != OK) {
if (do_source(user_vimrc, true, DOSO_VIMRC) == FAIL if (do_source(user_vimrc, true, DOSO_VIMRC) == FAIL
&& process_env("EXINIT", FALSE) == FAIL && process_env("EXINIT", false) == FAIL
&& do_source((char_u *)USR_EXRC_FILE, FALSE, DOSO_NONE) == FAIL) { && do_source((char_u *)USR_EXRC_FILE, false, DOSO_NONE) == FAIL) {
#ifdef USR_EXRC_FILE2 #ifdef USR_EXRC_FILE2
(void)do_source((char_u *)USR_EXRC_FILE2, FALSE, DOSO_NONE); (void)do_source((char_u *)USR_EXRC_FILE2, false, DOSO_NONE);
#endif #endif
} }
} }

4
src/nvim/os/env.c
View File

@@ -431,7 +431,7 @@ const void *vim_colon_env_iter(const char *const val,
const void *const iter, const void *const iter,
const char **const dir, const char **const dir,
size_t *const len) size_t *const len)
FUNC_ATTR_NONNULL_ARG(1,3,4) FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_NONNULL_ARG(1, 3, 4) FUNC_ATTR_WARN_UNUSED_RESULT
{ {
const char *varval = (const char *) iter; const char *varval = (const char *) iter;
if (varval == NULL) { if (varval == NULL) {
@@ -464,7 +464,7 @@ const void *vim_colon_env_iter_rev(const char *const val,
const void *const iter, const void *const iter,
const char **const dir, const char **const dir,
size_t *const len) size_t *const len)
FUNC_ATTR_NONNULL_ARG(1,3,4) FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_NONNULL_ARG(1, 3, 4) FUNC_ATTR_WARN_UNUSED_RESULT
{ {
const char *varend = (const char *) iter; const char *varend = (const char *) iter;
if (varend == NULL) { if (varend == NULL) {