mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-19 09:48:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.4283: using a variable for the return value is not needed

Browse Source 
Problem:    Using a variable for the return value is not needed.
Solution:   Return the value directly. (closes vim/vim#9687)
73257149d7

Also move down variable declarations in changedir_func().
vim_chdirfile() doesn't need change.
This commit is contained in:
zeertzjq
2022-02-02 21:33:46 +08:00
parent 1bce6d6e16
commit cd44f0a401
1 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/nvim/ex_docmd.c
View File

@@ -7835,13 +7835,11 @@ void post_chdir(CdScope scope, bool trigger_dirchanged)
/// @return true if the directory is successfully changed. /// @return true if the directory is successfully changed.
bool changedir_func(char_u *new_dir, CdScope scope) bool changedir_func(char_u *new_dir, CdScope scope)
{ {
char_u *pdir = NULL;
bool retval = false;
if (new_dir == NULL || allbuf_locked()) { if (new_dir == NULL || allbuf_locked()) {
return false; return false;
} }
char_u *pdir = NULL;
// ":cd -": Change to previous directory // ":cd -": Change to previous directory
if (STRCMP(new_dir, "-") == 0) { if (STRCMP(new_dir, "-") == 0) {
pdir = get_prevdir(scope); pdir = get_prevdir(scope);
@@ -7874,27 +7872,26 @@ bool changedir_func(char_u *new_dir, CdScope scope)
if (dir_differs && vim_chdir(new_dir) != 0) { if (dir_differs && vim_chdir(new_dir) != 0) {
emsg(_(e_failed)); emsg(_(e_failed));
xfree(pdir); xfree(pdir);
} else { return false;
char_u **pp;
switch (scope) {
case kCdScopeTabpage:
pp = &curtab->tp_prevdir;
break;
case kCdScopeWindow:
pp = &curwin->w_prevdir;
break;
default:
pp = &prev_dir;
}
xfree(*pp);
*pp = pdir;
post_chdir(scope, dir_differs);
retval = true;
} }
return retval; char_u **pp;
switch (scope) {
case kCdScopeTabpage:
pp = &curtab->tp_prevdir;
break;
case kCdScopeWindow:
pp = &curwin->w_prevdir;
break;
default:
pp = &prev_dir;
}
xfree(*pp);
*pp = pdir;
post_chdir(scope, dir_differs);
return true;
} }
/// ":cd", ":tcd", ":lcd", ":chdir", "tchdir" and ":lchdir". /// ":cd", ":tcd", ":lcd", ":chdir", "tchdir" and ":lchdir".