tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-31 01:24:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

MdeModulePkg: Fix VS2015 warning C4456 in RegularExpressionDxe

Browse Source 
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
This commit is contained in:
Liming Gao 2015-12-04 03:14:14 +00:00 committed by lgao4
parent 7b2c31ae65
commit d76946e328
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regexec.c
View File

@ -1442,7 +1442,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
case OP_EXACT1_IC: MOP_IN(OP_EXACT1_IC); case OP_EXACT1_IC: MOP_IN(OP_EXACT1_IC);
{ {
int len; int len;
UChar *q, lowbuf[ONIGENC_MBC_CASE_FOLD_MAXLEN]; UChar *q1, lowbuf[ONIGENC_MBC_CASE_FOLD_MAXLEN];
DATA_ENSURE(1); DATA_ENSURE(1);
len = ONIGENC_MBC_CASE_FOLD(encode, len = ONIGENC_MBC_CASE_FOLD(encode,
@ -1450,12 +1450,12 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
case_fold_flag, case_fold_flag,
&s, end, lowbuf); &s, end, lowbuf);
DATA_ENSURE(0); DATA_ENSURE(0);
q = lowbuf; q1 = lowbuf;
while (len-- > 0) { while (len-- > 0) {
if (*p != *q) { if (*p != *q1) {
goto fail; goto fail;
} }
p++; q++; p++; q1++;
} }
} }
MOP_OUT; 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); case OP_EXACTN_IC: MOP_IN(OP_EXACTN_IC);
{ {
int len; 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); GET_LENGTH_INC(tlen, p);
endp = p + tlen; endp = p + tlen;
@ -1544,10 +1544,10 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
case_fold_flag, case_fold_flag,
&s, end, lowbuf); &s, end, lowbuf);
DATA_ENSURE(0); DATA_ENSURE(0);
q = lowbuf; qn = lowbuf;
while (len-- > 0) { while (len-- > 0) {
if (*p != *q) goto fail; if (*p != *qn) goto fail;
p++; q++; p++; qn++;
} }
} }
} }

4
MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regint.h
View File

@ -329,8 +329,8 @@ typedef Bits* BitSetRef;
#define SIZE_BITSET sizeof(BitSet) #define SIZE_BITSET sizeof(BitSet)
#define BITSET_CLEAR(bs) do {\ #define BITSET_CLEAR(bs) do {\
int i;\ int id;\
for (i = 0; i < (int )BITSET_SIZE; i++) { (bs)[i] = 0; } \ for (id = 0; id < (int )BITSET_SIZE; id++) { (bs)[id] = 0; } \
} while (0) } while (0)
#define BS_ROOM(bs,pos) (bs)[pos / BITS_IN_ROOM] #define BS_ROOM(bs,pos) (bs)[pos / BITS_IN_ROOM]