moriyoshi Sun Oct 20 03:16:21 2002 EDT
Modified files:
/php4/ext/mbstring mbstring.c
Log:
ZTS fixes
Index: php4/ext/mbstring/mbstring.c
diff -u php4/ext/mbstring/mbstring.c:1.106 php4/ext/mbstring/mbstring.c:1.107
--- php4/ext/mbstring/mbstring.c:1.106 Sat Oct 19 22:57:39 2002
+++ php4/ext/mbstring/mbstring.c Sun Oct 20 03:16:20 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.106 2002/10/20 02:57:39 fujimoto Exp $ */
+/* $Id: mbstring.c,v 1.107 2002/10/20 07:16:20 moriyoshi Exp $ */
/*
* PHP4 Multibyte String module "mbstring" (currently only for Japanese)
@@ -754,7 +754,9 @@
PHP_MINIT_FUNCTION(mbstring)
{
#ifdef ZTS
- ts_allocate_id(&mbstring_globals_id, sizeof(zend_mbstring_globals),
(ts_allocate_ctor) php_mbstring_init_globals, (ts_allocate_dtor)
mbstring_globals_dtor);
+ ts_allocate_id(&mbstring_globals_id, sizeof(zend_mbstring_globals),
+ (ts_allocate_ctor) php_mbstring_init_globals,
+ (ts_allocate_dtor) mbstring_globals_dtor);
#else
php_mbstring_init_globals(&mbstring_globals TSRMLS_CC);
#endif
@@ -3498,7 +3500,7 @@
string.no_language = MBSTRG(current_language);
string.val = (char*)arg_string;
string.len = arg_length;
- ret = mbfl_identify_encoding_name(&string, elist, size);
+ ret = mbfl_identify_encoding_name(&string, elist, size TSRMLS_CC);
if (list != NULL) {
efree((void *)list);
}
@@ -3540,19 +3542,19 @@
string.len = from_length;
/* initialize converter */
- convd = mbfl_buffer_converter_new(from_encoding, to_encoding, string.len);
+ convd = mbfl_buffer_converter_new(from_encoding, to_encoding, string.len
+TSRMLS_CC);
if (convd == NULL)
return -1;
- mbfl_buffer_converter_illegal_mode(convd, MBSTRG(current_filter_illegal_mode));
- mbfl_buffer_converter_illegal_substchar(convd,
MBSTRG(current_filter_illegal_substchar));
+ mbfl_buffer_converter_illegal_mode(convd, MBSTRG(current_filter_illegal_mode)
+TSRMLS_CC);
+ mbfl_buffer_converter_illegal_substchar(convd,
+MBSTRG(current_filter_illegal_substchar) TSRMLS_CC);
/* do it */
- ret = mbfl_buffer_converter_feed_result(convd, &string, &result);
+ ret = mbfl_buffer_converter_feed_result(convd, &string, &result TSRMLS_CC);
if (ret != NULL) {
*to = ret->val;
*to_length = ret->len;
}
- mbfl_buffer_converter_delete(convd);
+ mbfl_buffer_converter_delete(convd TSRMLS_CC);
return ret ? 0 : -1;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
