cvs: php4 /ext/standard php_string.h string.c

sebastian Sun Aug 5 16:25:41 2001 EDT Modified files: /php4/ext/standard php_string.h string.c Log: Fix ZTS build. Index: php4/ext/standard/php_string.h diff -u php4/ext/standard/php_string.h:1.45 php4/ext/standard/php_string.h:1.46 --- php4/ext/standard/php_string.h:1.45 Sun Aug 5 16:02:22 2001 +++ php4/ext/standard/php_string.h Sun Aug 5 16:25:40 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_string.h,v 1.45 2001/08/05 20:02:22 jeroen Exp $ */ +/* $Id: php_string.h,v 1.46 2001/08/05 20:25:40 sebastian Exp $ */ /* Synced with php 3.0 revision 1.43 1999-06-16 [ssb] */ @@ -149,6 +149,6 @@ #endif void register_string_constants(INIT_FUNC_ARGS); -int php_charmask(unsigned char *input, int len, char *mask); +int php_charmask(unsigned char *input, int len, char *mask TSRMLS_DC); #endif /* PHP_STRING_H */ Index: php4/ext/standard/string.c diff -u php4/ext/standard/string.c:1.219 php4/ext/standard/string.c:1.220 --- php4/ext/standard/string.c:1.219 Sun Aug 5 15:38:49 2001 +++ php4/ext/standard/string.c Sun Aug 5 16:25:40 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: string.c,v 1.219 2001/08/05 19:38:49 jeroen Exp $ */ +/* $Id: string.c,v 1.220 2001/08/05 20:25:40 sebastian Exp $ */ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ @@ -408,7 +408,7 @@ * it needs to be incrementing. * Returns: FAILURE/SUCCESS wether the input was correct (i.e. no range errors) */ -int php_charmask(unsigned char *input, int len, char *mask) +int php_charmask(unsigned char *input, int len, char *mask TSRMLS_DC) { unsigned char *end; unsigned char c; @@ -470,6 +470,8 @@ what indicates which chars are to be trimmed. NULL->default (' \t\n\r\v\0') */ { + TSRMLS_FETCH(); + register int i; int len = str->value.str.len; int trimmed = 0; @@ -477,9 +479,9 @@ char mask[256]; if (what) { - php_charmask(what->value.str.val, what->value.str.len, mask); + php_charmask(what->value.str.val, what->value.str.len, mask TSRMLS_CC); } else { - php_charmask(" \n\r\t\v\0", 6, mask); + php_charmask(" \n\r\t\v\0", 6, mask TSRMLS_CC); } if (mode & 1) {