mirror of
https://github.com/php/php-src.git
synced 2024-09-22 10:27:25 +00:00
zend_make_printable_zval -> zend_make_string_zval
This commit is contained in:
parent
9bc954147e
commit
9c99b709a7
@ -1961,7 +1961,7 @@ static inline void spl_caching_it_next(spl_dual_it_object *intern TSRMLS_DC)
|
||||
if (UG(unicode)) {
|
||||
zend_make_unicode_zval(intern->u.caching.zstr, &expr_copy, &use_copy);
|
||||
} else {
|
||||
zend_make_printable_zval(intern->u.caching.zstr, &expr_copy, &use_copy);
|
||||
zend_make_string_zval(intern->u.caching.zstr, &expr_copy, &use_copy);
|
||||
}
|
||||
if (use_copy) {
|
||||
*intern->u.caching.zstr = expr_copy;
|
||||
|
@ -839,7 +839,7 @@ static char * php_formatted_print(int ht, int *len, int use_array, int format_of
|
||||
int use_copy = 0;
|
||||
|
||||
if (Z_TYPE_P(tmp) != IS_UNICODE) {
|
||||
zend_make_printable_zval(tmp, &var_copy, &use_copy);
|
||||
zend_make_string_zval(tmp, &var_copy, &use_copy);
|
||||
} else {
|
||||
var_copy = *tmp;
|
||||
zval_copy_ctor(&var_copy);
|
||||
|
@ -204,7 +204,7 @@ PHP_FUNCTION(strval)
|
||||
if (UG(unicode)) {
|
||||
zend_make_unicode_zval(*num, &expr_copy, &use_copy);
|
||||
} else {
|
||||
zend_make_printable_zval(*num, &expr_copy, &use_copy);
|
||||
zend_make_string_zval(*num, &expr_copy, &use_copy);
|
||||
}
|
||||
if (use_copy) {
|
||||
tmp = &expr_copy;
|
||||
|
Loading…
Reference in New Issue
Block a user