archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-17 14:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Move implementation of mb_strlen to mbstring.c

Browse source 
mbfl_strlen (in mbfilter.c) is still being used in a couple
of places but will go away soon.
This commit is contained in:
Alex Dowad 2022-07-19 10:15:31 +02:00
parent c63f18dd9b
commit 94fde1566f
1 changed files with 36 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

44
ext/mbstring/mbstring.c
View file

@ -1817,26 +1817,54 @@ PHP_FUNCTION(mb_str_split)
} }
/* }}} */ /* }}} */
static size_t mb_get_strlen(zend_string *string, const mbfl_encoding *encoding)
{
size_t len = 0;
if (encoding->flag & MBFL_ENCTYPE_SBCS) {
return ZSTR_LEN(string);
} else if (encoding->flag & MBFL_ENCTYPE_WCS2) {
return ZSTR_LEN(string) / 2;
} else if (encoding->flag & MBFL_ENCTYPE_WCS4) {
return ZSTR_LEN(string) / 4;
} else if (encoding->mblen_table) {
const unsigned char *mbtab = encoding->mblen_table;
unsigned char *p = (unsigned char*)ZSTR_VAL(string), *e = p + ZSTR_LEN(string);
while (p < e) {
p += mbtab[*p];
len++;
}
} else {
uint32_t wchar_buf[128];
unsigned char *in = (unsigned char*)ZSTR_VAL(string);
size_t in_len = ZSTR_LEN(string);
unsigned int state = 0;
while (in_len) {
len += encoding->to_wchar(&in, &in_len, wchar_buf, 128, &state);
}
}
return len;
}
/* {{{ Get character numbers of a string */ /* {{{ Get character numbers of a string */
PHP_FUNCTION(mb_strlen) PHP_FUNCTION(mb_strlen)
{ {
mbfl_string string; zend_string *string, *enc_name = NULL;
char *str;
zend_string *enc_name = NULL;
ZEND_PARSE_PARAMETERS_START(1, 2) ZEND_PARSE_PARAMETERS_START(1, 2)
Z_PARAM_STRING(str, string.len) Z_PARAM_STR(string)
Z_PARAM_OPTIONAL Z_PARAM_OPTIONAL
Z_PARAM_STR_OR_NULL(enc_name) Z_PARAM_STR_OR_NULL(enc_name)
ZEND_PARSE_PARAMETERS_END(); ZEND_PARSE_PARAMETERS_END();
string.val = (unsigned char*)str; const mbfl_encoding *enc = php_mb_get_encoding(enc_name, 2);
string.encoding = php_mb_get_encoding(enc_name, 2); if (!enc) {
if (!string.encoding) {
RETURN_THROWS(); RETURN_THROWS();
} }
RETVAL_LONG(mbfl_strlen(&string)); RETVAL_LONG(mb_get_strlen(string, enc));
} }
/* }}} */ /* }}} */