diff options
| author | Antony Dovgal <tony2001@php.net> | 2007-05-17 17:29:09 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2007-05-17 17:29:09 +0000 |
| commit | 9c99b709a72d962c6cefb272b0d7d43d4ceb353d (patch) | |
| tree | 0583e93c65beabd32c5b50f8ead156b68e1edbce | |
| parent | 9bc954147eea0efc6b2e0784d7217a30044806b5 (diff) | |
| download | php-git-9c99b709a72d962c6cefb272b0d7d43d4ceb353d.tar.gz | |
zend_make_printable_zval -> zend_make_string_zval
| -rwxr-xr-x | ext/spl/spl_iterators.c | 2 | ||||
| -rw-r--r-- | ext/standard/formatted_print.c | 2 | ||||
| -rw-r--r-- | ext/standard/type.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c index c0ec8b3581..d0e729dfb8 100755 --- 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 4a5a52411c..ee264ea107 100644 --- 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 77307ae2cc..07fe9d127f 100644 --- 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; |