MdeModulePkg: Fix VS2015 warning C4456 in RegularExpressionDxe

warning C4456: declaration of 'q' hides previous local declaration.
Update code to use the different local variable name.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Samer El-Haj-Mahmoud <samer.el-haj-mahmoud@hpe.com>
Acked-by: Michael Kinney <michael.d.kinney@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19113 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regexec.c b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regexec.c
index de5839a5838d3e6f58fecce1234fbab2bf8d0811..5e3ffa1838e1fa942e08322b12bfcb93b47e1baa 100644 (file)
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regexec.c
+++ b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regexec.c
@@ -1442,7 +1442,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
     case OP_EXACT1_IC:  MOP_IN(OP_EXACT1_IC);\r
       {\r
        int len;\r
-       UChar *q, lowbuf[ONIGENC_MBC_CASE_FOLD_MAXLEN];\r
+       UChar *q1, lowbuf[ONIGENC_MBC_CASE_FOLD_MAXLEN];\r
 \r
        DATA_ENSURE(1);\r
        len = ONIGENC_MBC_CASE_FOLD(encode,\r
@@ -1450,12 +1450,12 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
                    case_fold_flag,\r
                    &s, end, lowbuf);\r
        DATA_ENSURE(0);\r
-       q = lowbuf;\r
+       q1 = lowbuf;\r
        while (len-- > 0) {\r
-         if (*p != *q) {\r
+         if (*p != *q1) {\r
             goto fail;\r
           }\r
-         p++; q++;\r
+         p++; q1++;\r
        }\r
       }\r
       MOP_OUT;\r
@@ -1531,7 +1531,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
     case OP_EXACTN_IC:  MOP_IN(OP_EXACTN_IC);\r
       {\r
        int len;\r
-       UChar *q, *endp, lowbuf[ONIGENC_MBC_CASE_FOLD_MAXLEN];\r
+       UChar *qn, *endp, lowbuf[ONIGENC_MBC_CASE_FOLD_MAXLEN];\r
 \r
        GET_LENGTH_INC(tlen, p);\r
        endp = p + tlen;\r
@@ -1544,10 +1544,10 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
                      case_fold_flag,\r
                      &s, end, lowbuf);\r
          DATA_ENSURE(0);\r
-         q = lowbuf;\r
+         qn = lowbuf;\r
          while (len-- > 0) {\r
-           if (*p != *q) goto fail;\r
-           p++; q++;\r
+           if (*p != *qn) goto fail;\r
+           p++; qn++;\r
          }\r
        }\r
       }\r

diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regint.h b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regint.h
index 2db3b709e8397e4241239bdcb7fa3c1e00418058..44589bf999998550d37c9981ea762444016ca737 100644 (file)
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regint.h
+++ b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regint.h
@@ -329,8 +329,8 @@ typedef Bits*          BitSetRef;
 #define SIZE_BITSET        sizeof(BitSet)\r
 \r
 #define BITSET_CLEAR(bs) do {\\r
-  int i;\\r
-  for (i = 0; i < (int )BITSET_SIZE; i++) { (bs)[i] = 0; }     \\r
+  int id;\\r
+  for (id = 0; id < (int )BITSET_SIZE; id++) { (bs)[id] = 0; } \\r
 } while (0)\r
 \r
 #define BS_ROOM(bs,pos)            (bs)[pos / BITS_IN_ROOM]\r