summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2021-12-30 13:45:57 +0000
committerBram Moolenaar <Bram@vim.org>2021-12-30 13:45:57 +0000
commitf38aad85cf8e4e930c96cb843bc136949c8dbd29 (patch)
treef0f0bb71042ab3b49a8691fcc5beb55da1f1e2f1
parent1c67f3a9779b99bed7aacb3108abbb649445d3ed (diff)
patch 8.2.3947: unnecessary check for NULL pointerv8.2.3947
Problem: Unnecessary check for NULL pointer. Solution: Remove the check. (closes #9434)
-rw-r--r--src/ex_docmd.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 12824a9dc9..a9adea3b66 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -7411,9 +7411,9 @@ changedir_func(
# endif
new_dir = NameBuff;
}
- dir_differs = new_dir == NULL || pdir == NULL
+ dir_differs = pdir == NULL
|| pathcmp((char *)pdir, (char *)new_dir, -1) != 0;
- if (new_dir == NULL || (dir_differs && vim_chdir(new_dir)))
+ if (dir_differs && vim_chdir(new_dir))
{
emsg(_(e_failed));
vim_free(pdir);
diff --git a/src/version.c b/src/version.c
index 25e40bf4c7..56825f547b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3947,
+/**/
3946,
/**/
3945,