archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Rename php_mb_mbchar_bytes_ex to php_mb_mbchar_bytes

Browse source 
...And remove the original php_mb_mbchar_bytes, which was not being
used.
This commit is contained in:
Alex Dowad 2020-10-18 20:02:13 +02:00
parent 774cd960ab
commit d3f56e5ac9
3 changed files with 11 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ext/mbstring/php_mbregex.c
View file

@ -721,7 +721,7 @@ static inline void mb_regex_substitute(
eos = replace + replace_len;
while (p < eos) {
clen = (int) php_mb_mbchar_bytes_ex(p, enc);
clen = (int) php_mb_mbchar_bytes(p, enc);
if (clen != 1 || p == eos || p[0] != '\\') {
/* skip anything that's not an ascii backslash */
smart_str_appendl(pbuf, p, clen);
@ -729,7 +729,7 @@ static inline void mb_regex_substitute(
continue;
}
sp = p; /* save position */
clen = (int) php_mb_mbchar_bytes_ex(++p, enc);
clen = (int) php_mb_mbchar_bytes(++p, enc);
if (clen != 1 || p == eos) {
/* skip backslash followed by multibyte char */
smart_str_appendl(pbuf, sp, p - sp);
@ -759,7 +759,7 @@ static inline void mb_regex_substitute(
break;
case 'k':
{
clen = (int) php_mb_mbchar_bytes_ex(++p, enc);
clen = (int) php_mb_mbchar_bytes(++p, enc);
if (clen != 1 || p == eos || (p[0] != '<' && p[0] != '\'')) {
/* not a backref delimiter */
p += clen;
@ -772,7 +772,7 @@ static inline void mb_regex_substitute(
char maybe_num = 1;
name_end = name = p + 1;
while (name_end < eos) {
clen = (int) php_mb_mbchar_bytes_ex(name_end, enc);
clen = (int) php_mb_mbchar_bytes(name_end, enc);
if (clen != 1) {
name_end += clen;
maybe_num = 0;