tony2001 Thu May 17 17:29:09 2007 UTC
Modified files:
/php-src/ext/spl spl_iterators.c
/php-src/ext/standard formatted_print.c type.c
Log:
zend_make_printable_zval -> zend_make_string_zval
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_iterators.c?r1=1.161&r2=1.162&diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.161
php-src/ext/spl/spl_iterators.c:1.162
--- php-src/ext/spl/spl_iterators.c:1.161 Fri May 11 00:14:36 2007
+++ php-src/ext/spl/spl_iterators.c Thu May 17 17:29:09 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_iterators.c,v 1.161 2007/05/11 00:14:36 helly Exp $ */
+/* $Id: spl_iterators.c,v 1.162 2007/05/17 17:29:09 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -1961,7 +1961,7 @@
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;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/formatted_print.c?r1=1.99&r2=1.100&diff_format=u
Index: php-src/ext/standard/formatted_print.c
diff -u php-src/ext/standard/formatted_print.c:1.99
php-src/ext/standard/formatted_print.c:1.100
--- php-src/ext/standard/formatted_print.c:1.99 Wed Jan 17 08:25:25 2007
+++ php-src/ext/standard/formatted_print.c Thu May 17 17:29:09 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: formatted_print.c,v 1.99 2007/01/17 08:25:25 tony2001 Exp $ */
+/* $Id: formatted_print.c,v 1.100 2007/05/17 17:29:09 tony2001 Exp $ */
#include <math.h> /* modf() */
#include "php.h"
@@ -839,7 +839,7 @@
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);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/type.c?r1=1.50&r2=1.51&diff_format=u
Index: php-src/ext/standard/type.c
diff -u php-src/ext/standard/type.c:1.50 php-src/ext/standard/type.c:1.51
--- php-src/ext/standard/type.c:1.50 Sat Feb 24 16:25:55 2007
+++ php-src/ext/standard/type.c Thu May 17 17:29:09 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: type.c,v 1.50 2007/02/24 16:25:55 helly Exp $ */
+/* $Id: type.c,v 1.51 2007/05/17 17:29:09 tony2001 Exp $ */
#include "php.h"
#include "php_incomplete_class.h"
@@ -204,7 +204,7 @@
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;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
