@@ -99,16 +99,16 @@ static const unsigned char toupper_map[256] = {
99
99
* Functions using locale lowercase:
100
100
zend_binary_strncasecmp_l
101
101
zend_binary_strcasecmp_l
102
- zend_binary_zval_strcasecmp
103
- zend_binary_zval_strncasecmp
102
+ * Functions using ascii lowercase:
104
103
string_compare_function_ex
105
104
string_case_compare_function
106
- * Functions using ascii lowercase:
107
105
zend_str_tolower_copy
108
106
zend_str_tolower_dup
109
107
zend_str_tolower
110
108
zend_binary_strcasecmp
111
109
zend_binary_strncasecmp
110
+ zend_binary_zval_strcasecmp
111
+ zend_binary_zval_strncasecmp
112
112
*/
113
113
114
114
ZEND_API zend_long ZEND_FASTCALL zend_atol (const char * str , size_t str_len ) /* {{{ */
@@ -1972,7 +1972,7 @@ ZEND_API int ZEND_FASTCALL string_compare_function_ex(zval *op1, zval *op2, bool
1972
1972
int ret ;
1973
1973
1974
1974
if (case_insensitive ) {
1975
- ret = zend_binary_strcasecmp_l (ZSTR_VAL (str1 ), ZSTR_LEN (str1 ), ZSTR_VAL (str2 ), ZSTR_LEN (str1 ));
1975
+ ret = zend_binary_strcasecmp (ZSTR_VAL (str1 ), ZSTR_LEN (str1 ), ZSTR_VAL (str2 ), ZSTR_LEN (str1 ));
1976
1976
} else {
1977
1977
ret = zend_binary_strcmp (ZSTR_VAL (str1 ), ZSTR_LEN (str1 ), ZSTR_VAL (str2 ), ZSTR_LEN (str2 ));
1978
1978
}
@@ -2012,13 +2012,13 @@ ZEND_API int ZEND_FASTCALL string_case_compare_function(zval *op1, zval *op2) /*
2012
2012
if (Z_STR_P (op1 ) == Z_STR_P (op2 )) {
2013
2013
return 0 ;
2014
2014
} else {
2015
- return zend_binary_strcasecmp_l (Z_STRVAL_P (op1 ), Z_STRLEN_P (op1 ), Z_STRVAL_P (op2 ), Z_STRLEN_P (op2 ));
2015
+ return zend_binary_strcasecmp (Z_STRVAL_P (op1 ), Z_STRLEN_P (op1 ), Z_STRVAL_P (op2 ), Z_STRLEN_P (op2 ));
2016
2016
}
2017
2017
} else {
2018
2018
zend_string * tmp_str1 , * tmp_str2 ;
2019
2019
zend_string * str1 = zval_get_tmp_string (op1 , & tmp_str1 );
2020
2020
zend_string * str2 = zval_get_tmp_string (op2 , & tmp_str2 );
2021
- int ret = zend_binary_strcasecmp_l (ZSTR_VAL (str1 ), ZSTR_LEN (str1 ), ZSTR_VAL (str2 ), ZSTR_LEN (str1 ));
2021
+ int ret = zend_binary_strcasecmp (ZSTR_VAL (str1 ), ZSTR_LEN (str1 ), ZSTR_VAL (str2 ), ZSTR_LEN (str1 ));
2022
2022
2023
2023
zend_tmp_string_release (tmp_str1 );
2024
2024
zend_tmp_string_release (tmp_str2 );
@@ -3080,13 +3080,13 @@ ZEND_API int ZEND_FASTCALL zend_binary_zval_strncmp(zval *s1, zval *s2, zval *s3
3080
3080
3081
3081
ZEND_API int ZEND_FASTCALL zend_binary_zval_strcasecmp (zval * s1 , zval * s2 ) /* {{{ */
3082
3082
{
3083
- return zend_binary_strcasecmp_l (Z_STRVAL_P (s1 ), Z_STRLEN_P (s1 ), Z_STRVAL_P (s2 ), Z_STRLEN_P (s2 ));
3083
+ return zend_binary_strcasecmp (Z_STRVAL_P (s1 ), Z_STRLEN_P (s1 ), Z_STRVAL_P (s2 ), Z_STRLEN_P (s2 ));
3084
3084
}
3085
3085
/* }}} */
3086
3086
3087
3087
ZEND_API int ZEND_FASTCALL zend_binary_zval_strncasecmp (zval * s1 , zval * s2 , zval * s3 ) /* {{{ */
3088
3088
{
3089
- return zend_binary_strncasecmp_l (Z_STRVAL_P (s1 ), Z_STRLEN_P (s1 ), Z_STRVAL_P (s2 ), Z_STRLEN_P (s2 ), Z_LVAL_P (s3 ));
3089
+ return zend_binary_strncasecmp (Z_STRVAL_P (s1 ), Z_STRLEN_P (s1 ), Z_STRVAL_P (s2 ), Z_STRLEN_P (s2 ), Z_LVAL_P (s3 ));
3090
3090
}
3091
3091
/* }}} */
3092
3092
0 commit comments