Mercurial > vim
changeset 4567:96c1a7850097 v7.3.1031
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.
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Mon, 27 May 2013 11:22:04 +0200 |
| parents | 73c04954a835 |
| children | 1df934cf5c92 |
| files | src/regexp_nfa.c src/version.c |
| diffstat | 2 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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;