php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-22 23:48:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Simplify code for conversion of UHC to Unicode

Browse Source 
I was hoping to get some performance gains here, but the performance
is just the same as before, +/- a fraction of a percent.
This commit is contained in:
Alex Dowad
2023-01-01 17:35:40 +02:00
parent 0f4d37d040
commit ef114f94b9
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/mbstring/libmbfl/filters/mbfilter_uhc.c
+10 -6
View File
@@ -208,20 +208,24 @@ static size_t mb_uhc_to_wchar(unsigned char **in, size_t *in_len, uint32_t *buf,
*out++ = c;
} else if (c > 0x80 && c < 0xFE && c != 0xC9 && p < e) {
unsigned char c2 = *p++;
if (c2 < 0x41 || c2 == 0xFF) {
*out++ = MBFL_BAD_INPUT;
continue;
}
unsigned int w = 0;
if (c >= 0x81 && c <= 0xA0 && c2 >= 0x41 && c2 <= 0xFE) {
w = (c - 0x81)*190 + (c2 - 0x41);
if (c <= 0xA0) {
w = (c - 0x81)*190 + c2 - 0x41;
if (w < uhc1_ucs_table_size) {
w = uhc1_ucs_table[w];
}
} else if (c >= 0xA1 && c <= 0xC6 && c2 >= 0x41 && c2 <= 0xFE) {
w = (c - 0xA1)*190 + (c2 - 0x41);
} else if (c <= 0xC6) {
w = (c - 0xA1)*190 + c2 - 0x41;
if (w < uhc2_ucs_table_size) {
w = uhc2_ucs_table[w];
}
} else if (c >= 0xC7 && c < 0xFE && c2 >= 0xA1 && c2 <= 0xFE) {
w = (c - 0xC7)*94 + (c2 - 0xA1);
} else if (c2 >= 0xA1) {
w = (c - 0xC7)*94 + c2 - 0xA1;
if (w < uhc3_ucs_table_size) {
w = uhc3_ucs_table[w];
}