Re: [edk2] [Patch 3/6] MdeModulePkg: Fix VS2015 warning C4456 in RegularExpressionDxe

2015-12-03 Thread Kinney, Michael D 
Liming,

The source changes look good to me and I have verified that 
RegularExpressionDxe builds with VS2015.  I will let Samer do the review.

Acked-by: Michael Kinney 

Mike

> -Original Message-
> From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Liming 
> Gao
> Sent: Wednesday, December 2, 2015 9:27 PM
> To: edk2-devel@lists.01.org
> Subject: [edk2] [Patch 3/6] 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 
> Cc: El-Haj-Mahmoud Samer 
> ---
>  .../Universal/RegularExpressionDxe/Oniguruma/regexec.c   | 16 
> 
>  .../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_BITSETsizeof(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]
> --
> 1.9.5.msysgit.0
> 
> ___
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Re: [edk2] [Patch 3/6] MdeModulePkg: Fix VS2015 warning C4456 in RegularExpressionDxe

2015-12-02 Thread El-Haj-Mahmoud, Samer 
I only reviewed this patch, not the entire series

Reviewed-By:  Samer El-Haj-Mahmoud 


-Original Message-
From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Liming 
Gao
Sent: Wednesday, December 2, 2015 11:27 PM
To: edk2-devel@lists.01.org
Subject: [edk2] [Patch 3/6] 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 
Cc: El-Haj-Mahmoud Samer 
---
 .../Universal/RegularExpressionDxe/Oniguruma/regexec.c   | 16 
 .../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_BITSETsizeof(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]
-- 
1.9.5.msysgit.0

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

[edk2] [Patch 3/6] MdeModulePkg: Fix VS2015 warning C4456 in RegularExpressionDxe

2015-12-02 Thread Liming Gao 
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 
Cc: El-Haj-Mahmoud Samer 
---
 .../Universal/RegularExpressionDxe/Oniguruma/regexec.c   | 16 
 .../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_BITSETsizeof(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]
-- 
1.9.5.msysgit.0

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel