diff options
Diffstat (limited to 'ext/spl/spl_iterators.c')
| -rw-r--r-- | ext/spl/spl_iterators.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c index 80f2a623b2..ac9b9bef83 100644 --- a/ext/spl/spl_iterators.c +++ b/ext/spl/spl_iterators.c @@ -1196,9 +1196,7 @@ SPL_METHOD(RecursiveTreeIterator, key) } if (Z_TYPE(key) != IS_STRING) { - int use_copy; - zend_make_printable_zval(&key, &key_copy, &use_copy); - if (use_copy) { + if (zend_make_printable_zval(&key, &key_copy)) { key = key_copy; } } @@ -1974,7 +1972,7 @@ SPL_METHOD(RegexIterator, accept) } ZVAL_UNDEF(&subject_copy); - zend_make_printable_zval(subject_ptr, &subject_copy, &use_copy); + use_copy = zend_make_printable_zval(subject_ptr, &subject_copy); if (use_copy) { subject = Z_STRVAL(subject_copy); subject_len = Z_STRLEN(subject_copy); @@ -2611,7 +2609,7 @@ static inline void spl_caching_it_next(spl_dual_it_object *intern TSRMLS_DC) } else { ZVAL_COPY_VALUE(&intern->u.caching.zstr, &intern->current.data); } - zend_make_printable_zval(&intern->u.caching.zstr, &expr_copy, &use_copy); + use_copy = zend_make_printable_zval(&intern->u.caching.zstr, &expr_copy); if (use_copy) { ZVAL_COPY(&intern->u.caching.zstr, &expr_copy); //??? INIT_PZVAL(intern->u.caching.zstr); |