aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/eval/funcs.c
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2021-12-20 14:28:11 -0500
committerGitHub <noreply@github.com>2021-12-20 14:28:11 -0500
commit9241c684e18d85205b1a6e4e4a33b187b78a7356 (patch)
tree5e4364934c842a3cae555e29f5e50db2be85b9ec /src/nvim/eval/funcs.c
parent9625832372e77c8a15f6ebb30df4fcbb6aba6fe8 (diff)
parent09c412837fc9690ac8817dfd9c623dc6771c8d25 (diff)
downloadrneovim-9241c684e18d85205b1a6e4e4a33b187b78a7356.tar.gz
rneovim-9241c684e18d85205b1a6e4e4a33b187b78a7356.tar.bz2
rneovim-9241c684e18d85205b1a6e4e4a33b187b78a7356.zip
Merge pull request #16734 from zeertzjq/chdir-refactor
refactor: remove some chdir-related unnecessary calls and checks
Diffstat (limited to 'src/nvim/eval/funcs.c')
-rw-r--r--src/nvim/eval/funcs.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c
index d43eeb4a15..4d6ed56164 100644
--- a/src/nvim/eval/funcs.c
+++ b/src/nvim/eval/funcs.c
@@ -1082,15 +1082,13 @@ static void f_chdir(typval_T *argvars, typval_T *rettv, FunPtr fptr)
// Return the current directory
cwd = xmalloc(MAXPATHL);
- if (cwd != NULL) {
- if (os_dirname(cwd, MAXPATHL) != FAIL) {
+ if (os_dirname(cwd, MAXPATHL) != FAIL) {
#ifdef BACKSLASH_IN_FILENAME
- slash_adjust(cwd);
+ slash_adjust(cwd);
#endif
- rettv->vval.v_string = vim_strsave(cwd);
- }
- xfree(cwd);
+ rettv->vval.v_string = vim_strsave(cwd);
}
+ xfree(cwd);
if (curwin->w_localdir != NULL) {
scope = kCdScopeWindow;