From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web11.46.1571624003378784627 for ; Sun, 20 Oct 2019 19:13:23 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.115, mailfrom: shenglei.zhang@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Oct 2019 19:13:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,321,1566889200"; d="scan'208";a="201242490" Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by orsmga006.jf.intel.com with ESMTP; 20 Oct 2019 19:13:21 -0700 From: "Zhang, Shenglei" To: devel@edk2.groups.io Cc: Jian J Wang , Hao A Wu Subject: [PATCH] MdeModulePkg/Oniguruma: Remove redundant IF statement Date: Mon, 21 Oct 2019 10:13:14 +0800 Message-Id: <20191021021314.26724-1-shenglei.zhang@intel.com> X-Mailer: git-send-email 2.18.0.windows.1 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 Cc: Hao A Wu Signed-off-by: Shenglei Zhang --- .../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