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

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

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

View File

@@ -7358,7 +7358,8 @@ changedir_func(
{ {
char_u *pdir = NULL; char_u *pdir = NULL;
int dir_differs; int dir_differs;
int retval = FALSE; char_u *acmd_fname;
char_u **pp;
if (new_dir == NULL || allbuf_locked()) if (new_dir == NULL || allbuf_locked())
return FALSE; return FALSE;
@@ -7415,11 +7416,8 @@ changedir_func(
{ {
emsg(_(e_command_failed)); emsg(_(e_command_failed));
vim_free(pdir); vim_free(pdir);
return FALSE;
} }
else
{
char_u *acmd_fname;
char_u **pp;
if (scope == CDSCOPE_WINDOW) if (scope == CDSCOPE_WINDOW)
pp = &curwin->w_prevdir; pp = &curwin->w_prevdir;
@@ -7443,10 +7441,7 @@ changedir_func(
apply_autocmds(EVENT_DIRCHANGED, acmd_fname, new_dir, FALSE, apply_autocmds(EVENT_DIRCHANGED, acmd_fname, new_dir, FALSE,
curbuf); curbuf);
} }
retval = TRUE; return TRUE;
}
return retval;
} }
/* /*

View File

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

View File

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