diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-02-10 10:04:30 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-02-10 10:04:30 +0400 |
| commit | f4cfaf36e23ca47da3e352e1c60909104c059647 (patch) | |
| tree | 0db3e2a323b12c5bbf1a958c857f92eb58c240d1 /Zend/zend_variables.h | |
| parent | 89a9acea1f9d821a9805b3857bf4febbba08690d (diff) | |
| download | php-git-f4cfaf36e23ca47da3e352e1c60909104c059647.tar.gz | |
Use better data structures (incomplete)
Diffstat (limited to 'Zend/zend_variables.h')
| -rw-r--r-- | Zend/zend_variables.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/Zend/zend_variables.h b/Zend/zend_variables.h index 30f170bfbe..9ce1312b0d 100644 --- a/Zend/zend_variables.h +++ b/Zend/zend_variables.h @@ -29,7 +29,7 @@ ZEND_API void _zval_dtor_func(zval *zvalue ZEND_FILE_LINE_DC); static zend_always_inline void _zval_dtor(zval *zvalue ZEND_FILE_LINE_DC) { - if (zvalue->type <= IS_BOOL) { + if (!Z_REFCOUNTED_P(zvalue)) { return; } _zval_dtor_func(zvalue ZEND_FILE_LINE_RELAY_CC); @@ -39,18 +39,18 @@ 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) { - if (zvalue->type <= IS_BOOL) { + if (!Z_REFCOUNTED_P(zvalue)) { return; } _zval_copy_ctor_func(zvalue ZEND_FILE_LINE_RELAY_CC); } -ZEND_API int zval_copy_static_var(zval **p TSRMLS_DC, int num_args, va_list args, zend_hash_key *key); +ZEND_API int zval_copy_static_var(zval *p TSRMLS_DC, int num_args, va_list args, zend_hash_key *key); ZEND_API int zend_print_variable(zval *var); -ZEND_API void _zval_ptr_dtor(zval **zval_ptr ZEND_FILE_LINE_DC); +ZEND_API void _zval_ptr_dtor(zval *zval_ptr ZEND_FILE_LINE_DC); ZEND_API void _zval_internal_dtor(zval *zvalue ZEND_FILE_LINE_DC); -ZEND_API void _zval_internal_ptr_dtor(zval **zvalue ZEND_FILE_LINE_DC); +ZEND_API void _zval_internal_ptr_dtor(zval *zvalue ZEND_FILE_LINE_DC); 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) @@ -61,9 +61,9 @@ ZEND_API void _zval_dtor_wrapper(zval *zvalue); #if ZEND_DEBUG ZEND_API void _zval_copy_ctor_wrapper(zval *zvalue); -ZEND_API void _zval_ptr_dtor_wrapper(zval **zval_ptr); +ZEND_API void _zval_ptr_dtor_wrapper(zval *zval_ptr); ZEND_API void _zval_internal_dtor_wrapper(zval *zvalue); -ZEND_API void _zval_internal_ptr_dtor_wrapper(zval **zvalue); +ZEND_API void _zval_internal_ptr_dtor_wrapper(zval *zvalue); #define zval_copy_ctor_wrapper _zval_copy_ctor_wrapper #define zval_ptr_dtor_wrapper _zval_ptr_dtor_wrapper #define zval_internal_dtor_wrapper _zval_internal_dtor_wrapper @@ -75,15 +75,15 @@ ZEND_API void _zval_internal_ptr_dtor_wrapper(zval **zvalue); #define zval_internal_ptr_dtor_wrapper _zval_internal_ptr_dtor #endif -ZEND_API void zval_add_ref(zval **p); +ZEND_API void zval_add_ref(zval *p); END_EXTERN_C() -#define ZVAL_DESTRUCTOR (void (*)(void *)) zval_dtor_wrapper -#define ZVAL_PTR_DTOR (void (*)(void *)) zval_ptr_dtor_wrapper -#define ZVAL_INTERNAL_DTOR (void (*)(void *)) zval_internal_dtor_wrapper -#define ZVAL_INTERNAL_PTR_DTOR (void (*)(void *)) zval_internal_ptr_dtor_wrapper -#define ZVAL_COPY_CTOR (void (*)(void *)) zval_copy_ctor_wrapper +#define ZVAL_DESTRUCTOR zval_dtor_wrapper +#define ZVAL_PTR_DTOR zval_ptr_dtor_wrapper +#define ZVAL_INTERNAL_DTOR zval_internal_dtor_wrapper +#define ZVAL_INTERNAL_PTR_DTOR zval_internal_ptr_dtor_wrapper +#define ZVAL_COPY_CTOR zval_copy_ctor_wrapper #endif |