diff options
| author | Liming Gao <liming.gao@intel.com> | 2015-12-04 03:14:14 +0000 |
|---|---|---|
| committer | lgao4 <lgao4@Edk2> | 2015-12-04 03:14:14 +0000 |
| commit | d76946e328c51ab236de5d34edec774b0b01e4f5 (patch) | |
| tree | fe4e506b09b7c28bf30475103d41b4e3d54946d7 /MdeModulePkg/Universal | |
| parent | 7b2c31ae65491e94e906ccb3e4e691ee458f2eca (diff) | |
| download | edk2-d76946e328c51ab236de5d34edec774b0b01e4f5.zip edk2-d76946e328c51ab236de5d34edec774b0b01e4f5.tar.gz edk2-d76946e328c51ab236de5d34edec774b0b01e4f5.tar.bz2 | |
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
Diffstat (limited to 'MdeModulePkg/Universal')
| -rw-r--r-- | MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regexec.c | 16 | ||||
| -rw-r--r-- | MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regint.h | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regexec.c b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regexec.c index de5839a..5e3ffa1 100644 --- 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);
{
int len;
- UChar *q, lowbuf[ONIGENC_MBC_CASE_FOLD_MAXLEN];
+ UChar *q1, lowbuf[ONIGENC_MBC_CASE_FOLD_MAXLEN];
DATA_ENSURE(1);
len = ONIGENC_MBC_CASE_FOLD(encode,
@@ -1450,12 +1450,12 @@ match_at(regex_t* reg, const UChar* str, const UChar* end, case_fold_flag,
&s, end, lowbuf);
DATA_ENSURE(0);
- q = lowbuf;
+ q1 = lowbuf;
while (len-- > 0) {
- if (*p != *q) {
+ if (*p != *q1) {
goto fail;
}
- p++; q++;
+ p++; q1++;
}
}
MOP_OUT;
@@ -1531,7 +1531,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end, case OP_EXACTN_IC: MOP_IN(OP_EXACTN_IC);
{
int len;
- UChar *q, *endp, lowbuf[ONIGENC_MBC_CASE_FOLD_MAXLEN];
+ UChar *qn, *endp, lowbuf[ONIGENC_MBC_CASE_FOLD_MAXLEN];
GET_LENGTH_INC(tlen, p);
endp = p + tlen;
@@ -1544,10 +1544,10 @@ match_at(regex_t* reg, const UChar* str, const UChar* end, case_fold_flag,
&s, end, lowbuf);
DATA_ENSURE(0);
- q = lowbuf;
+ qn = lowbuf;
while (len-- > 0) {
- if (*p != *q) goto fail;
- p++; q++;
+ if (*p != *qn) goto fail;
+ p++; qn++;
}
}
}
diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regint.h b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regint.h index 2db3b70..44589bf 100644 --- 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)
#define BITSET_CLEAR(bs) do {\
- int i;\
- for (i = 0; i < (int )BITSET_SIZE; i++) { (bs)[i] = 0; } \
+ int id;\
+ for (id = 0; id < (int )BITSET_SIZE; id++) { (bs)[id] = 0; } \
} while (0)
#define BS_ROOM(bs,pos) (bs)[pos / BITS_IN_ROOM]
|