php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-26 09:12:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make use of TSRMLS_C/D

Browse Source
This commit is contained in:
Yasuo Ohgaki
2002-03-12 06:56:57 +00:00
parent 7f8b2a6533
commit e953dba0d7
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ext/standard/array.c
View File

@@ -233,14 +233,12 @@ PHP_FUNCTION(ksort)
/* }}} */
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 @@ int php_count_recursive(zval *array, long mode)
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 @@ PHP_FUNCTION(count)
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);