diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-05-07 15:03:56 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-05-07 15:03:56 +0400 |
| commit | 0c6a6f0fba3be20010e36e127f52e58531eee32d (patch) | |
| tree | 3a59ce914b8df46324a7616356deebe42d1ee42d /Zend/zend_variables.c | |
| parent | 2393000aeb6be8f7dd9e33585b96bb279f4f1eff (diff) | |
| download | php-git-0c6a6f0fba3be20010e36e127f52e58531eee32d.tar.gz | |
Re-applyed Bob's patch with minor fixes
Diffstat (limited to 'Zend/zend_variables.c')
| -rw-r--r-- | Zend/zend_variables.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c index c05e404c06..fcb0dd1b3e 100644 --- a/Zend/zend_variables.c +++ b/Zend/zend_variables.c @@ -37,9 +37,8 @@ ZEND_API void _zval_dtor_func(zend_refcounted *p ZEND_FILE_LINE_DC) STR_RELEASE(str); break; } - case IS_ARRAY: - case IS_CONSTANT_ARRAY: { - zend_array *arr =(zend_array*)p; + case IS_ARRAY: { + zend_array *arr = (zend_array*)p; TSRMLS_FETCH(); if (arr != &EG(symbol_table)) { @@ -52,7 +51,7 @@ ZEND_API void _zval_dtor_func(zend_refcounted *p ZEND_FILE_LINE_DC) break; } case IS_CONSTANT_AST: { - zend_ast_ref *ast =(zend_ast_ref*)p; + zend_ast_ref *ast = (zend_ast_ref*)p; zend_ast_destroy(ast->ast); efree(ast); @@ -98,9 +97,8 @@ ZEND_API void _zval_dtor_func_for_ptr(zend_refcounted *p ZEND_FILE_LINE_DC) STR_FREE(str); break; } - case IS_ARRAY: - case IS_CONSTANT_ARRAY: { - zend_array *arr =(zend_array*)p; + case IS_ARRAY: { + zend_array *arr = (zend_array*)p; TSRMLS_FETCH(); if (arr != &EG(symbol_table)) { @@ -113,7 +111,7 @@ ZEND_API void _zval_dtor_func_for_ptr(zend_refcounted *p ZEND_FILE_LINE_DC) break; } case IS_CONSTANT_AST: { - zend_ast_ref *ast =(zend_ast_ref*)p; + zend_ast_ref *ast = (zend_ast_ref*)p; zend_ast_destroy(ast->ast); efree(ast); @@ -155,7 +153,6 @@ ZEND_API void _zval_internal_dtor(zval *zvalue ZEND_FILE_LINE_DC) STR_RELEASE(Z_STR_P(zvalue)); break; case IS_ARRAY: - case IS_CONSTANT_ARRAY: case IS_CONSTANT_AST: case IS_OBJECT: case IS_RESOURCE: @@ -187,7 +184,6 @@ ZEND_API void _zval_internal_dtor_for_ptr(zval *zvalue ZEND_FILE_LINE_DC) STR_FREE(Z_STR_P(zvalue)); break; case IS_ARRAY: - case IS_CONSTANT_ARRAY: case IS_CONSTANT_AST: case IS_OBJECT: case IS_RESOURCE: @@ -240,8 +236,7 @@ ZEND_API void _zval_copy_ctor_func(zval *zvalue ZEND_FILE_LINE_DC) CHECK_ZVAL_STRING_REL(Z_STR_P(zvalue)); Z_STR_P(zvalue) = STR_DUP(Z_STR_P(zvalue), 0); break; - case IS_ARRAY: - case IS_CONSTANT_ARRAY: { + case IS_ARRAY: { HashTable *ht; TSRMLS_FETCH(); |