From: "Wu, Hao A" <hao.a.wu@intel.com>
To: "devel@edk2.groups.io" <devel@edk2.groups.io>,
"Zhang, Shenglei" <shenglei.zhang@intel.com>
Cc: "Wang, Jian J" <jian.j.wang@intel.com>
Subject: Re: [edk2-devel] [PATCH] MdeModulePkg/Oniguruma: Remove redundant IF statement
Date: Wed, 30 Oct 2019 07:20:40 +0000 [thread overview]
Message-ID: <B80AF82E9BFB8E4FBD8C89DA810C6A093C955799@SHSMSX104.ccr.corp.intel.com> (raw)
In-Reply-To: <20191021021314.26724-1-shenglei.zhang@intel.com>
> -----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
>
>
>
prev parent reply other threads:[~2019-10-30 7:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-21 2:13 [PATCH] MdeModulePkg/Oniguruma: Remove redundant IF statement Zhang, Shenglei
2019-10-30 7:20 ` Wu, Hao A [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=B80AF82E9BFB8E4FBD8C89DA810C6A093C955799@SHSMSX104.ccr.corp.intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox