updated for version 7.3.1031

Problem:    Compiler warnings for shadowed variable. (John Little)
Solution:   Move the variable declarations to the scope where they are used.

diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index 1d992a9a0ce294e498d6f3304c73a549b554d434..08375234cf733e9044de4b5af8f5130faa40623c 100644 (file)
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -2999,7 +2999,6 @@ nfa_regmatch(start, submatch, m)
     nfa_list_T *nextlist;
     nfa_list_T *neglist;
     int                *listids = NULL;
-    int                j = 0;
 #ifdef NFA_REGEXP_DEBUG_LOG
     FILE       *debug = fopen(NFA_REGEXP_DEBUG_LOG, "a");
 
@@ -3149,6 +3148,9 @@ nfa_regmatch(start, submatch, m)
            switch (t->state->c)
            {
            case NFA_MATCH:
+             {
+               int j;
+
                nfa_match = TRUE;
                submatch->in_use = t->sub.in_use;
                if (REG_MULTI)
@@ -3186,6 +3188,7 @@ nfa_regmatch(start, submatch, m)
                if (nextlist->n == 0 && neglist->n == 0)
                    clen = 0;
                goto nextchar;
+             }
 
            case NFA_END_INVISIBLE:
                /* This is only encountered after a NFA_START_INVISIBLE node.
@@ -3251,6 +3254,8 @@ nfa_regmatch(start, submatch, m)
 #endif
                if (result == TRUE)
                {
+                   int j;
+
                    /* Restore position in input text */
                    reginput = old_reginput;
                    regline = old_regline;

diff --git a/src/version.c b/src/version.c
index 6170d7ca3bc55796a9d05ef537b897c4378e3d43..c9325b3e7be68d6e209c8e8752d25c00e890b90d 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1031,
 /**/
     1030,
 /**/