0
0
mirror of https://github.com/vim/vim.git synced 2025-10-06 05:44:14 -04:00

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.
This commit is contained in:
Bram Moolenaar
2013-05-27 11:22:04 +02:00
parent 2cb8feb880
commit eb3ecae23a
2 changed files with 8 additions and 1 deletions

View File

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

View File

@@ -728,6 +728,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1031,
/**/ /**/
1030, 1030,
/**/ /**/