iliaa Mon Aug 28 23:33:37 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard string.c php_string.h
Log:
Adjust code to avoid TSRMLS_FETCH
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.14&r2=1.445.2.14.2.15&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.445.2.14.2.14
php-src/ext/standard/string.c:1.445.2.14.2.15
--- php-src/ext/standard/string.c:1.445.2.14.2.14 Mon Aug 28 09:56:28 2006
+++ php-src/ext/standard/string.c Mon Aug 28 23:33:37 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.445.2.14.2.14 2006/08/28 09:56:28 tony2001 Exp $ */
+/* $Id: string.c,v 1.445.2.14.2.15 2006/08/28 23:33:37 iliaa Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -880,7 +880,7 @@
/* {{{ php_implode
*/
-PHPAPI void php_implode(zval *delim, zval *arr, zval *return_value)
+PHPAPI void php_implode(zval *delim, zval *arr, zval *return_value TSRMLS_DC)
{
zval **tmp;
HashPosition pos;
@@ -888,7 +888,6 @@
int numelems, i = 0;
zval tmp_val;
int str_len;
- TSRMLS_FETCH();
numelems = zend_hash_num_elements(Z_ARRVAL_P(arr));
@@ -1001,7 +1000,7 @@
pos = Z_ARRVAL_P(arr)->pInternalPointer;
- php_implode(delim, arr, return_value);
+ php_implode(delim, arr, return_value TSRMLS_CC);
Z_ARRVAL_P(arr)->pInternalPointer = pos;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/php_string.h?r1=1.87.2.2&r2=1.87.2.2.2.1&diff_format=u
Index: php-src/ext/standard/php_string.h
diff -u php-src/ext/standard/php_string.h:1.87.2.2
php-src/ext/standard/php_string.h:1.87.2.2.2.1
--- php-src/ext/standard/php_string.h:1.87.2.2 Sun Jan 1 12:50:15 2006
+++ php-src/ext/standard/php_string.h Mon Aug 28 23:33:37 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_string.h,v 1.87.2.2 2006/01/01 12:50:15 sniper Exp $ */
+/* $Id: php_string.h,v 1.87.2.2.2.1 2006/08/28 23:33:37 iliaa Exp $ */
/* Synced with php 3.0 revision 1.43 1999-06-16 [ssb] */
@@ -134,7 +134,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(zval *delim, zval *str, 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
