archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use explicit helper

Browse source
This commit is contained in:
George Peter Banyard 2020-03-31 20:23:57 +02:00
parent affc5a024a
commit daf45f68d2
1 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ext/mbstring/php_mbregex.c
View file

@ -845,7 +845,7 @@ PHP_FUNCTION(mb_regex_encoding)
} }
if (!encoding) { if (!encoding) {
const char *retval = _php_mb_regex_mbctype2name(MBREX(current_mbctype)); const char *retval = php_mb_regex_get_mbctype();
if (retval == NULL) { if (retval == NULL) {
RETURN_FALSE; RETURN_FALSE;
@ -912,7 +912,7 @@ static void _php_mb_regex_ereg_exec(INTERNAL_FUNCTION_PARAMETERS, int icase)
if (!php_mb_check_encoding( if (!php_mb_check_encoding(
string, string,
string_len, string_len,
_php_mb_regex_mbctype2name(MBREX(current_mbctype)) php_mb_regex_get_mbctype()
)) { )) {
RETURN_FALSE; RETURN_FALSE;
} }
@ -1020,7 +1020,7 @@ static void _php_mb_regex_ereg_replace_exec(INTERNAL_FUNCTION_PARAMETERS, OnigOp
{ {
const char *current_enc_name; const char *current_enc_name;
current_enc_name = _php_mb_regex_mbctype2name(MBREX(current_mbctype)); current_enc_name = php_mb_regex_get_mbctype();
if (current_enc_name == NULL || if (current_enc_name == NULL ||
(enc = mbfl_name2encoding(current_enc_name)) == NULL) { (enc = mbfl_name2encoding(current_enc_name)) == NULL) {
php_error_docref(NULL, E_WARNING, "Unknown error"); php_error_docref(NULL, E_WARNING, "Unknown error");
@ -1053,7 +1053,7 @@ static void _php_mb_regex_ereg_replace_exec(INTERNAL_FUNCTION_PARAMETERS, OnigOp
if (!php_mb_check_encoding( if (!php_mb_check_encoding(
string, string,
string_len, string_len,
_php_mb_regex_mbctype2name(MBREX(current_mbctype)) php_mb_regex_get_mbctype()
)) { )) {
RETURN_NULL(); RETURN_NULL();
} }
@ -1260,8 +1260,7 @@ PHP_FUNCTION(mb_split)
count--; count--;
} }
if (!php_mb_check_encoding(string, string_len, if (!php_mb_check_encoding(string, string_len, php_mb_regex_get_mbctype())) {
_php_mb_regex_mbctype2name(MBREX(current_mbctype)))) {
RETURN_FALSE; RETURN_FALSE;
} }
@ -1355,8 +1354,7 @@ PHP_FUNCTION(mb_ereg_match)
} }
} }
if (!php_mb_check_encoding(string, string_len, if (!php_mb_check_encoding(string, string_len, php_mb_regex_get_mbctype())) {
_php_mb_regex_mbctype2name(MBREX(current_mbctype)))) {
RETURN_FALSE; RETURN_FALSE;
} }
@ -1568,7 +1566,7 @@ PHP_FUNCTION(mb_ereg_search_init)
if (php_mb_check_encoding( if (php_mb_check_encoding(
ZSTR_VAL(arg_str), ZSTR_VAL(arg_str),
ZSTR_LEN(arg_str), ZSTR_LEN(arg_str),
_php_mb_regex_mbctype2name(MBREX(current_mbctype)) php_mb_regex_get_mbctype()
)) { )) {
MBREX(search_pos) = 0; MBREX(search_pos) = 0;
RETVAL_TRUE; RETVAL_TRUE;