summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author=?UTF-8?q?Dundar=20G=C3=B6c?= <gocdundar@gmail.com>2021-07-08 18:05:00 +0200
committerBram Moolenaar <Bram@vim.org>2021-07-08 18:05:00 +0200
commit09f688c33aad9692276dfb68842cf0621a0e2002 (patch)
tree1952a816ca036465ad290ff4e59d6fe949176b05
parentdeb108ba0a8599c1307ddc1507c73e7b60f17d36 (diff)
patch 8.2.3125: variables are set but not usedv8.2.3125
Problem: Variables are set but not used. Solution: Move the declarations to the block where they are used. (closes #8527)
-rw-r--r--src/regexp_nfa.c10
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 5 deletions
diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index 7dff195ea2..db629def76 100644
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -1371,8 +1371,6 @@ nfa_regatom(void)
int negated;
int result;
int startc = -1;
- int endc = -1;
- int oldstartc = -1;
int save_prev_at_start = prev_at_start;
c = getchr();
@@ -1838,7 +1836,7 @@ collection:
* Failed to recognize a character class. Use the simple
* version that turns [abc] into 'a' OR 'b' OR 'c'
*/
- startc = endc = oldstartc = -1;
+ startc = -1;
negated = FALSE;
if (*regparse == '^') // negated range
{
@@ -1859,7 +1857,8 @@ collection:
emit_range = FALSE;
while (regparse < endp)
{
- oldstartc = startc;
+ int oldstartc = startc;
+
startc = -1;
got_coll_char = FALSE;
if (*regparse == '[')
@@ -2017,7 +2016,8 @@ collection:
// Previous char was '-', so this char is end of range.
if (emit_range)
{
- endc = startc;
+ int endc = startc;
+
startc = oldstartc;
if (startc > endc)
EMSG_RET_FAIL(_(e_reverse_range));
diff --git a/src/version.c b/src/version.c
index 1fb224326d..117051ffbb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3125,
+/**/
3124,
/**/
3123,