summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-06-06 10:07:01 +0100
committerBram Moolenaar <Bram@vim.org>2022-06-06 10:07:01 +0100
commit1f89abf69d2c485c38da9a45161e806de0f86f2f (patch)
treeb4ea5044700b4ca34360e42d134e185fa8c47520
parent99c48fe9974b8d70ca33674658a3da722b0d6466 (diff)
downloadvim-git-1f89abf69d2c485c38da9a45161e806de0f86f2f.tar.gz
patch 8.2.5062: Coverity warns for dead codev8.2.5062
Problem: Coverity warns for dead code. Solution: Remove the dead code.
-rw-r--r--src/match.c8
-rw-r--r--src/os_unix.c2
-rw-r--r--src/version.c2
3 files changed, 3 insertions, 9 deletions
diff --git a/src/match.c b/src/match.c
index 72276527d..c9231876b 100644
--- a/src/match.c
+++ b/src/match.c
@@ -446,14 +446,6 @@ next_search_hl(
// or none is found in this line.
for (;;)
{
-# ifdef FEAT_RELTIME
- // Stop searching after passing the time limit.
- if (timed_out)
- {
- shl->lnum = 0; // no match found in time
- break;
- }
-# endif
// Three situations:
// 1. No useful previous match: search from start of line.
// 2. Not Vi compatible or empty match: continue at next character.
diff --git a/src/os_unix.c b/src/os_unix.c
index b23adb710..72f80c95d 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -8422,7 +8422,7 @@ start_timeout(long msec)
if (ret == 0)
{
alarm_pending = sigismember(&sigs, SIGALRM);
- ret = ret == 0 ? sigprocmask(SIG_SETMASK, &saved_sigs, NULL) : ret;
+ ret = sigprocmask(SIG_SETMASK, &saved_sigs, NULL);
}
if (unlikely(ret != 0 || alarm_pending < 0))
{
diff --git a/src/version.c b/src/version.c
index 074652ba4..542028606 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 5062,
+/**/
5061,
/**/
5060,