diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-02-12 22:51:19 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-02-12 22:51:19 +0400 |
| commit | 7a9348f45defff0c9b46655f0ad5c5d69e43cae5 (patch) | |
| tree | 67ee42861ee1b411d3778ed69d597e3b2fa713d4 /Zend/zend_variables.h | |
| parent | d3954f16d3c5ea03031951f2c7c3c99944e740ee (diff) | |
| download | php-git-7a9348f45defff0c9b46655f0ad5c5d69e43cae5.tar.gz | |
Reverted zval_clear() and zval_release() back to zval_ptr_dtor()
Diffstat (limited to 'Zend/zend_variables.h')
| -rw-r--r-- | Zend/zend_variables.h | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/Zend/zend_variables.h b/Zend/zend_variables.h index 19b8add917..9ce1312b0d 100644 --- a/Zend/zend_variables.h +++ b/Zend/zend_variables.h @@ -35,20 +35,6 @@ static zend_always_inline void _zval_dtor(zval *zvalue ZEND_FILE_LINE_DC) _zval_dtor_func(zvalue ZEND_FILE_LINE_RELAY_CC); } -static zend_always_inline void _zval_clear(zval *zval_ptr, zend_bool reset ZEND_FILE_LINE_DC) -{ - if (!Z_REFCOUNTED_P(zval_ptr)) { - return; - } - Z_DELREF_P(zval_ptr); - if (Z_REFCOUNT_P(zval_ptr) == 0) { - _zval_dtor_func(zval_ptr ZEND_FILE_LINE_RELAY_CC); - if (reset) { - ZVAL_UNDEF(zval_ptr); - } - } -} - ZEND_API void _zval_copy_ctor_func(zval *zvalue ZEND_FILE_LINE_DC); static zend_always_inline void _zval_copy_ctor(zval *zvalue ZEND_FILE_LINE_DC) @@ -69,9 +55,6 @@ ZEND_API void _zval_dtor_wrapper(zval *zvalue); #define zval_copy_ctor(zvalue) _zval_copy_ctor((zvalue) ZEND_FILE_LINE_CC) #define zval_dtor(zvalue) _zval_dtor((zvalue) ZEND_FILE_LINE_CC) #define zval_ptr_dtor(zval_ptr) _zval_ptr_dtor((zval_ptr) ZEND_FILE_LINE_CC) -#define zval_clear_ex(zval_ptr, reset) _zval_clear((zval_ptr), (reset) ZEND_FILE_LINE_CC) -#define zval_release(zval_ptr) zval_clear_ex((zval_ptr), 0 ZEND_FILE_LINE_CC) -#define zval_clear(zval_ptr) zval_clear_ex((zval_ptr), 1 ZEND_FILE_LINE_CC) #define zval_internal_dtor(zvalue) _zval_internal_dtor((zvalue) ZEND_FILE_LINE_CC) #define zval_internal_ptr_dtor(zvalue) _zval_internal_ptr_dtor((zvalue) ZEND_FILE_LINE_CC) #define zval_dtor_wrapper _zval_dtor_wrapper |