sebastian Fri Aug 12 01:58:04 2005 EDT
Modified files:
/php-src/ext/standard string.c
Log:
ZTS fixes.
http://cvs.php.net/diff.php/php-src/ext/standard/string.c?r1=1.447&r2=1.448&ty=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.447 php-src/ext/standard/string.c:1.448
--- php-src/ext/standard/string.c:1.447 Thu Aug 11 19:35:59 2005
+++ php-src/ext/standard/string.c Fri Aug 12 01:58:02 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.447 2005/08/11 23:35:59 andrei Exp $ */
+/* $Id: string.c,v 1.448 2005/08/12 05:58:02 sebastian Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -584,7 +584,7 @@
* Expands possible ranges of the form 'a..b' in input charlist,
* where a < b in code-point order
*/
-static int php_expand_u_trim_range(UChar **range, int32_t *range_len)
+static int php_expand_u_trim_range(UChar **range, int32_t *range_len TSRMLS_DC)
{
UChar32 *codepts, *tmp, *input, *end, c;
int32_t len, tmp_len, idx;
@@ -673,7 +673,7 @@
int32_t start = 0, end = len;
if ( what ) {
- php_expand_u_trim_range(&what, &what_len);
+ php_expand_u_trim_range(&what, &what_len TSRMLS_CC);
}
if ( mode & 1 ) {
@@ -1110,7 +1110,7 @@
if ( str_type == IS_UNICODE ) {
add_index_unicodel(return_value, 0, (UChar *)str,
str_len, 1);
} else if ( str_type == IS_BINARY ) {
- add_index_binaryl(return_value, 0, (char *)str,
str_len, 1);
+ add_index_binaryl(return_value, 0, (char *)str,
str_len, 1 TSRMLS_CC);
} else {
add_index_stringl(return_value, 0, (char *)str,
str_len, 1);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
