diff options
Diffstat (limited to 'Zend/zend_list.c')
| -rw-r--r-- | Zend/zend_list.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/Zend/zend_list.c b/Zend/zend_list.c index 4cd588367f..db418ac186 100644 --- a/Zend/zend_list.c +++ b/Zend/zend_list.c @@ -263,7 +263,7 @@ void zend_destroy_rsrc_plist(TSRMLS_D) } -static int clean_module_resource(zend_rsrc_list_entry *le, int *resource_id) +static int clean_module_resource(zend_rsrc_list_entry *le, int *resource_id TSRMLS_DC) { if (le->type == *resource_id) { return 1; @@ -273,13 +273,11 @@ static int clean_module_resource(zend_rsrc_list_entry *le, int *resource_id) } -static int zend_clean_module_rsrc_dtors_cb(zend_rsrc_list_dtors_entry *ld, int *module_number) +static int zend_clean_module_rsrc_dtors_cb(zend_rsrc_list_dtors_entry *ld, int *module_number TSRMLS_DC) { if (ld->module_number == *module_number) { - TSRMLS_FETCH(); - - zend_hash_apply_with_argument(&EG(regular_list), (int (*)(void *,void *)) clean_module_resource, (void *) &(ld->resource_id)); - zend_hash_apply_with_argument(&EG(persistent_list), (int (*)(void *,void *)) clean_module_resource, (void *) &(ld->resource_id)); + zend_hash_apply_with_argument(&EG(regular_list), (apply_func_arg_t) clean_module_resource, (void *) &(ld->resource_id) TSRMLS_CC); + zend_hash_apply_with_argument(&EG(persistent_list), (apply_func_arg_t) clean_module_resource, (void *) &(ld->resource_id) TSRMLS_CC); return 1; } else { return 0; @@ -287,9 +285,9 @@ static int zend_clean_module_rsrc_dtors_cb(zend_rsrc_list_dtors_entry *ld, int * } -void zend_clean_module_rsrc_dtors(int module_number) +void zend_clean_module_rsrc_dtors(int module_number TSRMLS_DC) { - zend_hash_apply_with_argument(&list_destructors, (int (*)(void *,void *)) zend_clean_module_rsrc_dtors_cb, (void *) &module_number); + zend_hash_apply_with_argument(&list_destructors, (apply_func_arg_t) zend_clean_module_rsrc_dtors_cb, (void *) &module_number TSRMLS_CC); } |