1. Patchew
  2. EDK2
  3. View series

[edk2-devel] [PATCH] MdeModulePkg/Oniguruma: Remove redundant IF statement

Zhang, Shenglei posted 1 patch 4 years, 6 months ago
Failed in applying to current master (apply log)
.../Oniguruma/unicode_fold1_key.c              | 18 +++++++-----------
.../Oniguruma/unicode_fold2_key.c              | 17 ++++++-----------
.../Oniguruma/unicode_fold3_key.c              | 18 +++++++-----------
.../Oniguruma/unicode_unfold_key.c             | 17 ++++++-----------
4 files changed, 26 insertions(+), 44 deletions(-)
[edk2-devel] [PATCH] MdeModulePkg/Oniguruma: Remove redundant IF statement
Posted by Zhang, Shenglei 4 years, 6 months ago 
The if statement is not necessary, so keep it to edk2 style.
And this change has been merged to onigruma.
REF:https://github.com/kkos/oniguruma/pull/158

Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Hao A Wu <hao.a.wu@intel.com>
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
---
 .../Oniguruma/unicode_fold1_key.c              | 18 +++++++-----------
 .../Oniguruma/unicode_fold2_key.c              | 17 ++++++-----------
 .../Oniguruma/unicode_fold3_key.c              | 18 +++++++-----------
 .../Oniguruma/unicode_unfold_key.c             | 17 ++++++-----------
 4 files changed, 26 insertions(+), 44 deletions(-)

diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/unicode_fold1_key.c b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/unicode_fold1_key.c
index 7dbd6a5995be..0aa54ee172b2 100644
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/unicode_fold1_key.c
+++ b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/unicode_fold1_key.c
@@ -2983,17 +2983,13 @@ onigenc_unicode_fold1_key(OnigCodePoint codes[])
       4026
     };
 
-  if (0 == 0)
-    {
-      int key = hash(codes);
-
-      if (key <= MAX_HASH_VALUE)
-        {
-          int index = wordlist[key];
-
-          if (index >= 0 && onig_codes_cmp(codes, OnigUnicodeFolds1 + index, 1) == 0)
-            return index;
-        }
+    int key = hash(codes);
+    if (key <= MAX_HASH_VALUE) {
+      int index = wordlist[key];
+      if (index >= 0 && onig_codes_cmp(codes, OnigUnicodeFolds1 + index, 1) == 0) {
+        return index;
+      }
     }
+
   return -1;
 }
diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/unicode_fold2_key.c b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/unicode_fold2_key.c
index 3d93e2417a2c..44f8cb660071 100644
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/unicode_fold2_key.c
+++ b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/unicode_fold2_key.c
@@ -211,17 +211,12 @@ onigenc_unicode_fold2_key(OnigCodePoint codes[])
       129
     };
 
-  if (0 == 0)
-    {
-      int key = hash(codes);
-
-      if (key <= MAX_HASH_VALUE)
-        {
-          int index = wordlist[key];
-
-          if (index >= 0 && onig_codes_cmp(codes, OnigUnicodeFolds2 + index, 2) == 0)
-            return index;
-        }
+    int key = hash(codes);
+    if (key <= MAX_HASH_VALUE) {
+      int index = wordlist[key];
+      if (index >= 0 && onig_codes_cmp(codes, OnigUnicodeFolds2 + index, 2) == 0)
+        return index;
     }
+
   return -1;
 }
diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/unicode_fold3_key.c b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/unicode_fold3_key.c
index bdd5667c6ae2..b36500b135e6 100644
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/unicode_fold3_key.c
+++ b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/unicode_fold3_key.c
@@ -121,17 +121,13 @@ onigenc_unicode_fold3_key(OnigCodePoint codes[])
       0
     };
 
-  if (0 == 0)
-    {
-      int key = hash(codes);
-
-      if (key <= MAX_HASH_VALUE)
-        {
-          int index = wordlist[key];
-
-          if (index >= 0 && onig_codes_cmp(codes, OnigUnicodeFolds3 + index, 3) == 0)
-            return index;
-        }
+    int key = hash(codes);
+    if (key <= MAX_HASH_VALUE) {
+      int index = wordlist[key];
+      if (index >= 0 && onig_codes_cmp(codes, OnigUnicodeFolds3 + index, 3) == 0) {
+        return index;
+      }
     }
+
   return -1;
 }
diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/unicode_unfold_key.c b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/unicode_unfold_key.c
index 10f7889ea372..1f03b21cfe54 100644
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/unicode_unfold_key.c
+++ b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/unicode_unfold_key.c
@@ -3288,17 +3288,12 @@ onigenc_unicode_unfold_key(OnigCodePoint code)
       {0x1e907, 4005, 1}
     };
 
-  if (0 == 0)
-    {
-      int key = hash(&code);
-
-      if (key <= MAX_HASH_VALUE)
-        {
-          OnigCodePoint gcode = wordlist[key].code;
-
-          if (code == gcode && wordlist[key].index >= 0)
-            return &wordlist[key];
-        }
+    int key = hash(&code);
+    if (key <= MAX_HASH_VALUE) {
+      OnigCodePoint gcode = wordlist[key].code;
+      if (code == gcode && wordlist[key].index >= 0) {
+        return &wordlist[key];
+      }
     }
   return 0;
 }
-- 
2.18.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#49268): https://edk2.groups.io/g/devel/message/49268
Mute This Topic: https://groups.io/mt/36262345/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] MdeModulePkg/Oniguruma: Remove redundant IF statement
Posted by Wu, Hao A 4 years, 5 months ago 
> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Zhang, Shenglei
> Sent: Monday, October 21, 2019 10:13 AM
> To: devel@edk2.groups.io
> Cc: Wang, Jian J; Wu, Hao A
> Subject: [edk2-devel] [PATCH] MdeModulePkg/Oniguruma: Remove redundant
> IF statement
> 
> The if statement is not necessary, so keep it to edk2 style.
> And this change has been merged to onigruma.
> REF:https://github.com/kkos/oniguruma/pull/158


Reviewed-by: Hao A Wu <hao.a.wu@intel.com>

Best Regards,
Hao Wu


> 
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Hao A Wu <hao.a.wu@intel.com>
> Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
> ---
>  .../Oniguruma/unicode_fold1_key.c              | 18 +++++++-----------
>  .../Oniguruma/unicode_fold2_key.c              | 17 ++++++-----------
>  .../Oniguruma/unicode_fold3_key.c              | 18 +++++++-----------
>  .../Oniguruma/unicode_unfold_key.c             | 17 ++++++-----------
>  4 files changed, 26 insertions(+), 44 deletions(-)
> 
> diff --git
> a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/unicode_fold1
> _key.c
> b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/unicode_fold1
> _key.c
> index 7dbd6a5995be..0aa54ee172b2 100644
> ---
> a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/unicode_fold1
> _key.c
> +++
> b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/unicode_fold1
> _key.c
> @@ -2983,17 +2983,13 @@ onigenc_unicode_fold1_key(OnigCodePoint
> codes[])
>        4026
>      };
> 
> -  if (0 == 0)
> -    {
> -      int key = hash(codes);
> -
> -      if (key <= MAX_HASH_VALUE)
> -        {
> -          int index = wordlist[key];
> -
> -          if (index >= 0 && onig_codes_cmp(codes, OnigUnicodeFolds1 + index, 1)
> == 0)
> -            return index;
> -        }
> +    int key = hash(codes);
> +    if (key <= MAX_HASH_VALUE) {
> +      int index = wordlist[key];
> +      if (index >= 0 && onig_codes_cmp(codes, OnigUnicodeFolds1 + index, 1)
> == 0) {
> +        return index;
> +      }
>      }
> +
>    return -1;
>  }
> diff --git
> a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/unicode_fold2
> _key.c
> b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/unicode_fold2
> _key.c
> index 3d93e2417a2c..44f8cb660071 100644
> ---
> a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/unicode_fold2
> _key.c
> +++
> b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/unicode_fold2
> _key.c
> @@ -211,17 +211,12 @@ onigenc_unicode_fold2_key(OnigCodePoint codes[])
>        129
>      };
> 
> -  if (0 == 0)
> -    {
> -      int key = hash(codes);
> -
> -      if (key <= MAX_HASH_VALUE)
> -        {
> -          int index = wordlist[key];
> -
> -          if (index >= 0 && onig_codes_cmp(codes, OnigUnicodeFolds2 + index, 2)
> == 0)
> -            return index;
> -        }
> +    int key = hash(codes);
> +    if (key <= MAX_HASH_VALUE) {
> +      int index = wordlist[key];
> +      if (index >= 0 && onig_codes_cmp(codes, OnigUnicodeFolds2 + index, 2)
> == 0)
> +        return index;
>      }
> +
>    return -1;
>  }
> diff --git
> a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/unicode_fold3
> _key.c
> b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/unicode_fold3
> _key.c
> index bdd5667c6ae2..b36500b135e6 100644
> ---
> a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/unicode_fold3
> _key.c
> +++
> b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/unicode_fold3
> _key.c
> @@ -121,17 +121,13 @@ onigenc_unicode_fold3_key(OnigCodePoint codes[])
>        0
>      };
> 
> -  if (0 == 0)
> -    {
> -      int key = hash(codes);
> -
> -      if (key <= MAX_HASH_VALUE)
> -        {
> -          int index = wordlist[key];
> -
> -          if (index >= 0 && onig_codes_cmp(codes, OnigUnicodeFolds3 + index, 3)
> == 0)
> -            return index;
> -        }
> +    int key = hash(codes);
> +    if (key <= MAX_HASH_VALUE) {
> +      int index = wordlist[key];
> +      if (index >= 0 && onig_codes_cmp(codes, OnigUnicodeFolds3 + index, 3)
> == 0) {
> +        return index;
> +      }
>      }
> +
>    return -1;
>  }
> diff --git
> a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/unicode_unfol
> d_key.c
> b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/unicode_unfol
> d_key.c
> index 10f7889ea372..1f03b21cfe54 100644
> ---
> a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/unicode_unfol
> d_key.c
> +++
> b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/unicode_unfol
> d_key.c
> @@ -3288,17 +3288,12 @@ onigenc_unicode_unfold_key(OnigCodePoint code)
>        {0x1e907, 4005, 1}
>      };
> 
> -  if (0 == 0)
> -    {
> -      int key = hash(&code);
> -
> -      if (key <= MAX_HASH_VALUE)
> -        {
> -          OnigCodePoint gcode = wordlist[key].code;
> -
> -          if (code == gcode && wordlist[key].index >= 0)
> -            return &wordlist[key];
> -        }
> +    int key = hash(&code);
> +    if (key <= MAX_HASH_VALUE) {
> +      OnigCodePoint gcode = wordlist[key].code;
> +      if (code == gcode && wordlist[key].index >= 0) {
> +        return &wordlist[key];
> +      }
>      }
>    return 0;
>  }
> --
> 2.18.0.windows.1
> 
> 
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#49642): https://edk2.groups.io/g/devel/message/49642
Mute This Topic: https://groups.io/mt/36262345/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.