cvs: php4 /ext/standard array.c

yohgaki Tue Mar 12 01:56:57 2002 EDT Modified files: /php4/ext/standard array.c Log: Make use of TSRMLS_C/D Index: php4/ext/standard/array.c diff -u php4/ext/standard/array.c:1.157 php4/ext/standard/array.c:1.158 --- php4/ext/standard/array.c:1.157 Fri Mar 1 07:00:05 2002 +++ php4/ext/standard/array.c Tue Mar 12 01:56:57 2002 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: array.c,v 1.157 2002/03/01 12:00:05 zeev Exp $ */ +/* $Id: array.c,v 1.158 2002/03/12 06:56:57 yohgaki Exp $ */ #include "php.h" #include "php_ini.h" @@ -233,14 +233,12 @@ /* }}} */ -int php_count_recursive(zval *array, long mode) +static int php_count_recursive(zval *array, long mode TSRMLS_DC) { long cnt = 0; zval **element; HashTable *target_hash; - TSRMLS_FETCH(); - target_hash = HASH_OF(array); if (Z_TYPE_P(array) == IS_ARRAY) @@ -252,7 +250,7 @@ for (zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(array), &pos); zend_hash_get_current_data_ex(Z_ARRVAL_P(array), (void **) &element, &pos) == SUCCESS; zend_hash_move_forward_ex(Z_ARRVAL_P(array), &pos)) { - cnt += php_count_recursive(*element, COUNT_RECURSIVE); + cnt += php_count_recursive(*element, COUNT_RECURSIVE TSRMLS_CC); } } } @@ -275,7 +273,7 @@ RETURN_LONG(0); break; case IS_ARRAY: - RETURN_LONG (php_count_recursive (array, mode)); + RETURN_LONG (php_count_recursive (array, mode) TSRMLS_CC); break; default: RETURN_LONG(1);