Patch 8.2.3125

[Bram Moolenaar]

Patch 8.2.3125
Problem: Variables are set but not used.
Solution: Move the declarations to the block where they are used.
(closes #8527)
Files: src/regexp_nfa.c


*** ../vim-8.2.3124/src/regexp_nfa.c 2021-07-05 20:14:54.400221570 +0200
--- src/regexp_nfa.c 2021-07-08 18:00:07.970082655 +0200
***************
*** 1371,1378 ****
int negated;
int result;
int startc = -1;
- int endc = -1;
- int oldstartc = -1;
int save_prev_at_start = prev_at_start;

c = getchr();
--- 1371,1376 ----
***************
*** 1838,1844 ****
* Failed to recognize a character class. Use the simple
* version that turns [abc] into 'a' OR 'b' OR 'c'
*/
! startc = endc = oldstartc = -1;
negated = FALSE;
if (*regparse == '^') // negated range
{
--- 1836,1842 ----
* Failed to recognize a character class. Use the simple
* version that turns [abc] into 'a' OR 'b' OR 'c'
*/
! startc = -1;
negated = FALSE;
if (*regparse == '^') // negated range
{
***************
*** 1859,1865 ****
emit_range = FALSE;
while (regparse < endp)
{
! oldstartc = startc;
startc = -1;
got_coll_char = FALSE;
if (*regparse == '[')
--- 1857,1864 ----
emit_range = FALSE;
while (regparse < endp)
{
! int oldstartc = startc;
!
startc = -1;
got_coll_char = FALSE;
if (*regparse == '[')
***************
*** 2017,2023 ****
// Previous char was '-', so this char is end of range.
if (emit_range)
{
! endc = startc;
startc = oldstartc;
if (startc > endc)
EMSG_RET_FAIL(_(e_reverse_range));
--- 2016,2023 ----
// Previous char was '-', so this char is end of range.
if (emit_range)
{
! int endc = startc;
!
startc = oldstartc;
if (startc > endc)
EMSG_RET_FAIL(_(e_reverse_range));
*** ../vim-8.2.3124/src/version.c 2021-07-08 17:35:33.136379926 +0200
--- src/version.c 2021-07-08 18:01:58.165900029 +0200
***************
*** 757,758 ****
--- 757,760 ----
{ /* Add new patch number below this line */
+ /**/
+ 3125,
/**/

--
hundred-and-one symptoms of being an internet addict:
92. It takes you two hours to check all 14 of your mailboxes.

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///