cvs: php4 /ext/standard cyr_convert.c file.c type.c

andi Mon Jul 8 14:29:55 2002 EDT Modified files: /php4/ext/standard cyr_convert.c file.c type.c Log: - Fix TSRMLS_* stuff Index: php4/ext/standard/cyr_convert.c diff -u php4/ext/standard/cyr_convert.c:1.20 php4/ext/standard/cyr_convert.c:1.21 --- php4/ext/standard/cyr_convert.c:1.20 Mon Jul 8 08:52:22 2002 +++ php4/ext/standard/cyr_convert.c Mon Jul 8 14:29:54 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cyr_convert.c,v 1.20 2002/07/08 12:52:22 derick Exp $ */ +/* $Id: cyr_convert.c,v 1.21 2002/07/08 18:29:54 andi Exp $ */ #include <stdlib.h> @@ -201,7 +201,7 @@ * d - x-cp866 * m - x-mac-cyrillic *****************************************************************************/ -static char * php_convert_cyr_string(unsigned char *str, int length, char from, char to) +static char * php_convert_cyr_string(unsigned char *str, int length, char from, char to TSRMLS_DC) { const unsigned char *from_table, *to_table; unsigned char tmp; @@ -284,7 +284,7 @@ str = (unsigned char*) estrndup(Z_STRVAL_PP(str_arg), Z_STRLEN_PP(str_arg)); - php_convert_cyr_string(str, Z_STRLEN_PP(str_arg), Z_STRVAL_PP(fr_cs)[0], Z_STRVAL_PP(to_cs)[0]); + php_convert_cyr_string(str, Z_STRLEN_PP(str_arg), Z_STRVAL_PP(fr_cs)[0], Z_STRVAL_PP(to_cs)[0] TSRMLS_CC); RETVAL_STRING((char *)str, 0) } /* }}} */ Index: php4/ext/standard/file.c diff -u php4/ext/standard/file.c:1.236 php4/ext/standard/file.c:1.237 --- php4/ext/standard/file.c:1.236 Mon Jul 8 08:52:22 2002 +++ php4/ext/standard/file.c Mon Jul 8 14:29:54 2002 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.236 2002/07/08 12:52:22 derick Exp $ */ +/* $Id: file.c,v 1.237 2002/07/08 18:29:54 andi Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -957,7 +957,7 @@ /* }}} */ /* TODO: move to main/network.c */ -PHPAPI int php_set_sock_blocking(int socketd, int block) +PHPAPI int php_set_sock_blocking(int socketd, int block TSRMLS_DC) { int ret = SUCCESS; int flags; @@ -1013,7 +1013,7 @@ RETURN_FALSE; } - if (php_set_sock_blocking(socketd, block) == FAILURE) + if (php_set_sock_blocking(socketd, block TSRMLS_CC) == FAILURE) RETURN_FALSE; php_stream_sock_set_blocking((php_stream*)what, block == 0 ? 0 : 1 TSRMLS_CC); Index: php4/ext/standard/type.c diff -u php4/ext/standard/type.c:1.17 php4/ext/standard/type.c:1.18 --- php4/ext/standard/type.c:1.17 Mon Jul 8 07:52:57 2002 +++ php4/ext/standard/type.c Mon Jul 8 14:29:54 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: type.c,v 1.17 2002/07/08 11:52:57 derick Exp $ */ +/* $Id: type.c,v 1.18 2002/07/08 18:29:54 andi Exp $ */ #include "php.h" @@ -195,7 +195,7 @@ pval **arg; if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) { - php_error (E_WARNING, "%s(): Only one argument expected", get_active_function_name (TSRMLS_CC)); + php_error(E_WARNING, "%s(): Only one argument expected", get_active_function_name(TSRMLS_C)); RETURN_FALSE; }