@@ -2026,10 +2026,9 @@ static zend_string *php_pcre_replace_func_impl(pcre_cache_entry *pce, zend_strin
20262026 return result ;
20272027}
20282028
2029- /* {{{ php_pcre_replace_func */
20302029static zend_always_inline zend_string * php_pcre_replace_func (zend_string * regex ,
20312030 zend_string * subject_str ,
2032- zend_fcall_info * fci , zend_fcall_info_cache * fcc ,
2031+ zend_fcall_info_cache * fcc ,
20332032 size_t limit , size_t * replace_count , zend_long flags )
20342033{
20352034 pcre_cache_entry * pce ; /* Compiled regular expression */
@@ -2045,7 +2044,6 @@ static zend_always_inline zend_string *php_pcre_replace_func(zend_string *regex,
20452044
20462045 return result ;
20472046}
2048- /* }}} */
20492047
20502048/* {{{ php_pcre_replace_array */
20512049static 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
21522150 zend_string * result ;
21532151
21542152 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 );
21572154 return result ;
21582155 } else {
21592156 /* If regex is an array */
@@ -2172,7 +2169,7 @@ static zend_string *php_replace_in_subject_func(zend_string *regex_str, HashTabl
21722169 /* Do the actual replacement and put the result back into subject
21732170 for further replacements. */
21742171 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 );
21762173 zend_tmp_string_release (tmp_regex_entry_str );
21772174 zend_string_release (subject );
21782175 subject = result ;
0 commit comments