diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-03-27 13:39:09 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-03-27 13:39:09 +0400 |
| commit | c6cba554544d9dc676d1cfa99447364c95768664 (patch) | |
| tree | bce842d1abb17b69c78d918384428002d10ed934 /ext/pcre/php_pcre.c | |
| parent | 54d559d893f07098e56bee4489d514726dc96f7d (diff) | |
| download | php-git-c6cba554544d9dc676d1cfa99447364c95768664.tar.gz | |
Use ZVAL_DEREF() macro
Diffstat (limited to 'ext/pcre/php_pcre.c')
| -rw-r--r-- | ext/pcre/php_pcre.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index d03198cf6c..9cc7815fa1 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -539,8 +539,8 @@ static void php_do_pcre_match(INTERNAL_FUNCTION_PARAMETERS, int global) /* {{{ * RETURN_FALSE; } - if (subpats && Z_ISREF_P(subpats)) { - subpats = Z_REFVAL_P(subpats); + if (subpats) { + ZVAL_DEREF_REF(subpats); } php_pcre_match_impl(pce, subject, subject_len, return_value, subpats, global, ZEND_NUM_ARGS() >= 4, flags, start_offset TSRMLS_CC); @@ -1392,9 +1392,7 @@ static void preg_replace_impl(INTERNAL_FUNCTION_PARAMETERS, int is_callable_repl } } if (ZEND_NUM_ARGS() > 4) { - if (Z_ISREF_P(zcount)) { - zcount = Z_REFVAL_P(zcount); - } + ZVAL_DEREF_REF(zcount); zval_dtor(zcount); ZVAL_LONG(zcount, replace_count); } |