andrey Sat Mar 12 08:08:19 2005 EDT
Modified files:
/php-src/ext/standard string.c
Log:
- type is either 1 or 2 if second parameter is set. if not set then type
is 0.
- use the lvalue for the second rvalue
http://cvs.php.net/diff.php/php-src/ext/standard/string.c?r1=1.431&r2=1.432&ty=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.431 php-src/ext/standard/string.c:1.432
--- php-src/ext/standard/string.c:1.431 Thu Mar 10 18:52:43 2005
+++ php-src/ext/standard/string.c Sat Mar 12 08:08:19 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.431 2005/03/10 23:52:43 helly Exp $ */
+/* $Id: string.c,v 1.432 2005/03/12 13:08:19 andrey Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -4678,10 +4678,9 @@
convert_to_string_ex(str);
- p = s = Z_STRVAL_PP(str);
- e = Z_STRVAL_PP(str) + Z_STRLEN_PP(str);
+ e = Z_STRLEN_PP(str) + (p = s = Z_STRVAL_PP(str));
- if (type == 1 || type == 2) {
+ if (type) {
array_init(return_value);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
