@@ -2026,10 +2026,9 @@ static zend_string *php_pcre_replace_func_impl(pcre_cache_entry *pce, zend_strin
2026
2026
return result ;
2027
2027
}
2028
2028
2029
- /* {{{ php_pcre_replace_func */
2030
2029
static zend_always_inline zend_string * php_pcre_replace_func (zend_string * regex ,
2031
2030
zend_string * subject_str ,
2032
- zend_fcall_info * fci , zend_fcall_info_cache * fcc ,
2031
+ zend_fcall_info_cache * fcc ,
2033
2032
size_t limit , size_t * replace_count , zend_long flags )
2034
2033
{
2035
2034
pcre_cache_entry * pce ; /* Compiled regular expression */
@@ -2045,7 +2044,6 @@ static zend_always_inline zend_string *php_pcre_replace_func(zend_string *regex,
2045
2044
2046
2045
return result ;
2047
2046
}
2048
- /* }}} */
2049
2047
2050
2048
/* {{{ php_pcre_replace_array */
2051
2049
static zend_string * php_pcre_replace_array (HashTable * regex ,
@@ -2152,8 +2150,7 @@ static zend_string *php_replace_in_subject_func(zend_string *regex_str, HashTabl
2152
2150
zend_string * result ;
2153
2151
2154
2152
if (regex_str ) {
2155
- result = php_pcre_replace_func (
2156
- regex_str , subject , fci , fcc , limit , replace_count , flags );
2153
+ result = php_pcre_replace_func (regex_str , subject , fcc , limit , replace_count , flags );
2157
2154
return result ;
2158
2155
} else {
2159
2156
/* If regex is an array */
@@ -2172,7 +2169,7 @@ static zend_string *php_replace_in_subject_func(zend_string *regex_str, HashTabl
2172
2169
/* Do the actual replacement and put the result back into subject
2173
2170
for further replacements. */
2174
2171
result = php_pcre_replace_func (
2175
- regex_entry_str , subject , fci , fcc , limit , replace_count , flags );
2172
+ regex_entry_str , subject , fcc , limit , replace_count , flags );
2176
2173
zend_tmp_string_release (tmp_regex_entry_str );
2177
2174
zend_string_release (subject );
2178
2175
subject = result ;
0 commit comments