tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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>
Reviewed-by: Hao A Wu <hao.a.wu@intel.com>
This commit is contained in:
Shenglei Zhang 2019-10-15 14:46:26 +08:00 committed by Liming Gao
parent c18708d2f0
commit 2b23beb043
4 changed files with 26 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/unicode_fold1_key.c
View File

@ -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;
}

17
MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/unicode_fold2_key.c
View File

@ -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;
}

18
MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/unicode_fold3_key.c
View File

@ -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;
}

17
MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/unicode_unfold_key.c
View File

@ -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;
}