iliaa Wed Aug 30 18:40:26 2006 UTC
Modified files:
/php-src/ext/standard string.c php_string.h
Log:
Avoid TSRMLS_FETCH
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.583&r2=1.584&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.583 php-src/ext/standard/string.c:1.584
--- php-src/ext/standard/string.c:1.583 Tue Aug 22 04:54:00 2006
+++ php-src/ext/standard/string.c Wed Aug 30 18:40:26 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.583 2006/08/22 04:54:00 dmitry Exp $ */
+/* $Id: string.c,v 1.584 2006/08/30 18:40:26 iliaa Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -1151,13 +1151,12 @@
/* {{{ php_implode
*/
-PHPAPI void php_implode(zval *delim, zval *arr, zval *retval)
+PHPAPI void php_implode(zval *delim, zval *arr, zval *retval TSRMLS_DC)
{
zend_uchar return_type;
int numelems, i=0;
HashPosition pos;
zval **tmp;
- TSRMLS_FETCH();
Z_TYPE_P(retval) = return_type = Z_TYPE_P(delim); /* ... to start off */
@@ -1295,7 +1294,7 @@
}
}
- php_implode(delim, arr, return_value);
+ php_implode(delim, arr, return_value TSRMLS_DC);
if (argc == 1) {
FREE_ZVAL(delim);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/php_string.h?r1=1.100&r2=1.101&diff_format=u
Index: php-src/ext/standard/php_string.h
diff -u php-src/ext/standard/php_string.h:1.100
php-src/ext/standard/php_string.h:1.101
--- php-src/ext/standard/php_string.h:1.100 Tue Aug 15 20:38:12 2006
+++ php-src/ext/standard/php_string.h Wed Aug 30 18:40:26 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_string.h,v 1.100 2006/08/15 20:38:12 andrei Exp $ */
+/* $Id: php_string.h,v 1.101 2006/08/30 18:40:26 iliaa Exp $ */
/* Synced with php 3.0 revision 1.43 1999-06-16 [ssb] */
@@ -147,7 +147,7 @@
PHPAPI size_t php_strip_tags(char *rbuf, int len, int *state, char *allow, int
allow_len);
PHPAPI int php_char_to_str_ex(char *str, uint len, char from, char *to, int
to_len, zval *result, int case_sensitivity, int *replace_count);
PHPAPI int php_char_to_str(char *str, uint len, char from, char *to, int
to_len, zval *result);
-PHPAPI void php_implode(zval *delim, zval *arr, zval *return_value);
+PHPAPI void php_implode(zval *delim, zval *arr, zval *return_value TSRMLS_DC);
PHPAPI void php_explode(char *delim, uint delim_len, char *str, uint str_len,
zend_uchar str_type, zval *return_value, int limit);
PHPAPI size_t php_strspn(char *s1, char *s2, char *s1_end, char *s2_end);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
