aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

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 #9687)
This commit is contained in:
zeertzjq
2022-02-02 13:16:37 +00:00
committed by Bram Moolenaar
parent adbb1bf21d
commit 73257149d7
3 changed files with 30 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/ex_docmd.c
View File

@@ -7358,7 +7358,8 @@ changedir_func(
{
char_u *pdir = NULL;
int dir_differs;
int retval = FALSE;
char_u *acmd_fname;
char_u **pp;
if (new_dir == NULL || allbuf_locked())
return FALSE;
@@ -7415,38 +7416,32 @@ changedir_func(
{
emsg(_(e_command_failed));
vim_free(pdir);
return FALSE;
}
if (scope == CDSCOPE_WINDOW)
pp = &curwin->w_prevdir;
else if (scope == CDSCOPE_TABPAGE)
pp = &curtab->tp_prevdir;
else
pp = &prev_dir;
vim_free(*pp);
*pp = pdir;
post_chdir(scope);
if (dir_differs)
{
char_u *acmd_fname;
char_u **pp;
if (scope == CDSCOPE_WINDOW)
pp = &curwin->w_prevdir;
acmd_fname = (char_u *)"window";
else if (scope == CDSCOPE_TABPAGE)
pp = &curtab->tp_prevdir;
acmd_fname = (char_u *)"tabpage";
else
pp = &prev_dir;
vim_free(*pp);
*pp = pdir;
post_chdir(scope);
if (dir_differs)
{
if (scope == CDSCOPE_WINDOW)
acmd_fname = (char_u *)"window";
else if (scope == CDSCOPE_TABPAGE)
acmd_fname = (char_u *)"tabpage";
else
acmd_fname = (char_u *)"global";
apply_autocmds(EVENT_DIRCHANGED, acmd_fname, new_dir, FALSE,
curbuf);
}
retval = TRUE;
acmd_fname = (char_u *)"global";
apply_autocmds(EVENT_DIRCHANGED, acmd_fname, new_dir, FALSE,
curbuf);
}
return retval;
return TRUE;
}
/*

16
src/misc2.c
View File

@@ -1903,7 +1903,6 @@ vim_chdirfile(char_u *fname, char *trigger_autocmd)
{
char_u old_dir[MAXPATHL];
char_u new_dir[MAXPATHL];
int res;
if (mch_dirname(old_dir, MAXPATHL) != OK)
*old_dir = NUL;
@@ -1913,16 +1912,15 @@ vim_chdirfile(char_u *fname, char *trigger_autocmd)
if (pathcmp((char *)old_dir, (char *)new_dir, -1) == 0)
// nothing to do
res = OK;
else
{
res = mch_chdir((char *)new_dir) == 0 ? OK : FAIL;
return OK;
if (res == OK && trigger_autocmd != NULL)
apply_autocmds(EVENT_DIRCHANGED, (char_u *)trigger_autocmd,
if (mch_chdir((char *)new_dir) != 0)
return FAIL;
if (trigger_autocmd != NULL)
apply_autocmds(EVENT_DIRCHANGED, (char_u *)trigger_autocmd,
new_dir, FALSE, curbuf);
}
return res;
return OK;
}
#endif

2
src/version.c
View File

@@ -746,6 +746,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
4283,
/**/
4282,
/**/