diff options
| author | Xinchen Hui <laruence@gmail.com> | 2018-07-06 18:37:45 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2018-07-06 18:37:45 +0800 |
| commit | e3355ac5ec1787b84ffd08c863dfbd26fe7bfb0f (patch) | |
| tree | 7a1cd1b77a93162e0d60b0e90fa269e4338d6ecf /Zend/zend_variables.c | |
| parent | a362ae6b12419369c5cbdbb4e924915f9b196ef6 (diff) | |
| download | php-git-e3355ac5ec1787b84ffd08c863dfbd26fe7bfb0f.tar.gz | |
Revert "Rename _zval_dtor_func to _ref_dtor_func"
This reverts commit a362ae6b12419369c5cbdbb4e924915f9b196ef6.
Diffstat (limited to 'Zend/zend_variables.c')
| -rw-r--r-- | Zend/zend_variables.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c index aa543694d8..32612f6cf0 100644 --- a/Zend/zend_variables.c +++ b/Zend/zend_variables.c @@ -44,27 +44,27 @@ static void ZEND_FASTCALL zend_ast_ref_destroy_wrapper(zend_ast_ref *ast ZEND_FI # define zend_ast_ref_destroy_wrapper zend_ast_ref_destroy #endif -typedef void (ZEND_FASTCALL *zend_ref_dtor_func_t)(zend_refcounted *p ZEND_FILE_LINE_DC); - -static const zend_ref_dtor_func_t zend_ref_dtor_func[] = { - /* IS_UNDEF */ (zend_ref_dtor_func_t)zend_empty_destroy, - /* IS_NULL */ (zend_ref_dtor_func_t)zend_empty_destroy, - /* IS_FALSE */ (zend_ref_dtor_func_t)zend_empty_destroy, - /* IS_TRUE */ (zend_ref_dtor_func_t)zend_empty_destroy, - /* IS_LONG */ (zend_ref_dtor_func_t)zend_empty_destroy, - /* IS_DOUBLE */ (zend_ref_dtor_func_t)zend_empty_destroy, - /* IS_STRING */ (zend_ref_dtor_func_t)zend_string_destroy, - /* IS_ARRAY */ (zend_ref_dtor_func_t)zend_array_destroy_wrapper, - /* IS_OBJECT */ (zend_ref_dtor_func_t)zend_object_destroy_wrapper, - /* IS_RESOURCE */ (zend_ref_dtor_func_t)zend_resource_destroy_wrapper, - /* IS_REFERENCE */ (zend_ref_dtor_func_t)zend_reference_destroy, - /* IS_CONSTANT_AST */ (zend_ref_dtor_func_t)zend_ast_ref_destroy_wrapper +typedef void (ZEND_FASTCALL *zend_zval_dtor_func_t)(zend_refcounted *p ZEND_FILE_LINE_DC); + +static const zend_zval_dtor_func_t zend_zval_dtor_func[] = { + /* IS_UNDEF */ (zend_zval_dtor_func_t)zend_empty_destroy, + /* IS_NULL */ (zend_zval_dtor_func_t)zend_empty_destroy, + /* IS_FALSE */ (zend_zval_dtor_func_t)zend_empty_destroy, + /* IS_TRUE */ (zend_zval_dtor_func_t)zend_empty_destroy, + /* IS_LONG */ (zend_zval_dtor_func_t)zend_empty_destroy, + /* IS_DOUBLE */ (zend_zval_dtor_func_t)zend_empty_destroy, + /* IS_STRING */ (zend_zval_dtor_func_t)zend_string_destroy, + /* IS_ARRAY */ (zend_zval_dtor_func_t)zend_array_destroy_wrapper, + /* IS_OBJECT */ (zend_zval_dtor_func_t)zend_object_destroy_wrapper, + /* IS_RESOURCE */ (zend_zval_dtor_func_t)zend_resource_destroy_wrapper, + /* IS_REFERENCE */ (zend_zval_dtor_func_t)zend_reference_destroy, + /* IS_CONSTANT_AST */ (zend_zval_dtor_func_t)zend_ast_ref_destroy_wrapper }; -ZEND_API void ZEND_FASTCALL _ref_dtor_func(zend_refcounted *p ZEND_FILE_LINE_DC) +ZEND_API void ZEND_FASTCALL _zval_dtor_func(zend_refcounted *p ZEND_FILE_LINE_DC) { ZEND_ASSERT(GC_TYPE(p) <= IS_CONSTANT_AST); - zend_ref_dtor_func[GC_TYPE(p)](p ZEND_FILE_LINE_RELAY_CC); + zend_zval_dtor_func[GC_TYPE(p)](p ZEND_FILE_LINE_RELAY_CC); } static void ZEND_FASTCALL zend_string_destroy(zend_string *str ZEND_FILE_LINE_DC) |