zend_make_printable_zval -> zend_make_string_zval

diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
index c0ec8b35811583f9f2867a500e5244dd325d3cc3..d0e729dfb80196ceeb4c643c713e4d1ca6f0f79b 100755 (executable)
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
@@ -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;

diff --git a/ext/standard/formatted_print.c b/ext/standard/formatted_print.c
index 4a5a52411c50f065e69fd740b60b71bd913698c0..ee264ea1077d591354d73e918c4f504142381b0e 100644 (file)
--- a/ext/standard/formatted_print.c
+++ b/ext/standard/formatted_print.c
@@ -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);

diff --git a/ext/standard/type.c b/ext/standard/type.c
index 77307ae2ccb79878217b48c0d6c5d66fddfd0a10..07fe9d127f66ec03f9689a77bf329bd9520a2eff 100644 (file)
--- a/ext/standard/type.c
+++ b/ext/standard/type.c
@@ -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;