cvs: php-src(PHP_5_3) /ext/standard string.c

mattwil Tue Mar 17 00:02:40 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard string.c Log: Removed unneeded HashPosition variable (php_implode() doesn't change the internal pointer) - It was added in '06 with the "200-300%" implode() optimization (hasn't been merged to HEAD) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.69.2.43&r2=1.445.2.14.2.69.2.44&diff_format=u Index: php-src/ext/standard/string.c diff -u php-src/ext/standard/string.c:1.445.2.14.2.69.2.43 php-src/ext/standard/string.c:1.445.2.14.2.69.2.44 --- php-src/ext/standard/string.c:1.445.2.14.2.69.2.43 Tue Mar 3 11:47:31 2009 +++ php-src/ext/standard/string.c Tue Mar 17 00:02:39 2009 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: string.c,v 1.445.2.14.2.69.2.43 2009/03/03 11:47:31 kalle Exp $ */ +/* $Id: string.c,v 1.445.2.14.2.69.2.44 2009/03/17 00:02:39 mattwil Exp $ */ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ @@ -1130,7 +1130,6 @@ PHP_FUNCTION(implode) { zval **arg1 = NULL, **arg2 = NULL, *delim, *arr; - HashPosition pos; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z|Z", &arg1, &arg2) == FAILURE) { return; @@ -1162,13 +1161,9 @@ return; } } - - pos = Z_ARRVAL_P(arr)->pInternalPointer; php_implode(delim, arr, return_value TSRMLS_CC); - Z_ARRVAL_P(arr)->pInternalPointer = pos; - if (arg2 == NULL) { FREE_ZVAL(delim); }