cvs: php-src /ext/standard array.c

dmitry Wed Aug 2 07:54:41 2006 UTC Modified files: /php-src/ext/standard array.c Log: zts fix http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.378&r2=1.379&diff_format=u Index: php-src/ext/standard/array.c diff -u php-src/ext/standard/array.c:1.378 php-src/ext/standard/array.c:1.379 --- php-src/ext/standard/array.c:1.378 Wed Aug 2 02:11:56 2006 +++ php-src/ext/standard/array.c Wed Aug 2 07:54:41 2006 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: array.c,v 1.378 2006/08/02 02:11:56 andrei Exp $ */ +/* $Id: array.c,v 1.379 2006/08/02 07:54:41 dmitry Exp $ */ #include "php.h" #include "php_ini.h" @@ -1390,7 +1390,7 @@ ZVAL_LONG(&num, num_key); convert_to_text(&num); - php_extract_prefix_varname(&final_name, prefix, Z_UNIVAL(num), Z_UNILEN(num), Z_TYPE(num)); + php_extract_prefix_varname(&final_name, prefix, Z_UNIVAL(num), Z_UNILEN(num), Z_TYPE(num) TSRMLS_CC); zval_dtor(&num); } else { zend_hash_move_forward_ex(Z_ARRVAL_P(var_array), &pos); @@ -1414,7 +1414,7 @@ case EXTR_PREFIX_IF_EXISTS: if (var_exists) { - php_extract_prefix_varname(&final_name, prefix, var_name, var_name_len, key_type); + php_extract_prefix_varname(&final_name, prefix, var_name, var_name_len, key_type TSRMLS_CC); } break; @@ -1426,14 +1426,14 @@ case EXTR_PREFIX_ALL: if (Z_TYPE(final_name) == IS_NULL && var_name_len != 0) { - php_extract_prefix_varname(&final_name, prefix, var_name, var_name_len, key_type); + php_extract_prefix_varname(&final_name, prefix, var_name, var_name_len, key_type TSRMLS_CC); } break; case EXTR_PREFIX_INVALID: if (Z_TYPE(final_name) == IS_NULL) { if (!php_valid_var_name(var_name, var_name_len, key_type)) { - php_extract_prefix_varname(&final_name, prefix, var_name, var_name_len, key_type); + php_extract_prefix_varname(&final_name, prefix, var_name, var_name_len, key_type TSRMLS_CC); } else { ZVAL_TEXTL(&final_name, var_name, var_name_len, 1); }