diff options
| author | Nikita Popov <nikic@php.net> | 2014-04-30 20:48:02 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2014-05-01 09:08:30 +0200 |
| commit | e0247de14701e38853a2a93b9763d60dd1df9bc8 (patch) | |
| tree | b6da1f818a5ae06951a27e25368d1ea09fe7aea1 /Zend/zend_builtin_functions.c | |
| parent | 5a03efe2790cc935d4d8ca723bd21ce8c079fbd4 (diff) | |
| download | php-git-e0247de14701e38853a2a93b9763d60dd1df9bc8.tar.gz | |
zend_stack_top() now returns pointer directly
Diffstat (limited to 'Zend/zend_builtin_functions.c')
| -rw-r--r-- | Zend/zend_builtin_functions.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index d858fe7982..bc998abc3c 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -1517,7 +1517,7 @@ ZEND_FUNCTION(restore_error_handler) zval *tmp; EG(user_error_handler_error_reporting) = zend_stack_int_top(&EG(user_error_handlers_error_reporting)); zend_stack_del_top(&EG(user_error_handlers_error_reporting)); - zend_stack_top(&EG(user_error_handlers), (void**)&tmp); + tmp = zend_stack_top(&EG(user_error_handlers)); ZVAL_COPY_VALUE(&EG(user_error_handler), tmp); zend_stack_del_top(&EG(user_error_handlers)); } @@ -1573,9 +1573,7 @@ ZEND_FUNCTION(restore_exception_handler) if (zend_stack_is_empty(&EG(user_exception_handlers))) { ZVAL_UNDEF(&EG(user_exception_handler)); } else { - zval *tmp; - - zend_stack_top(&EG(user_exception_handlers), (void**)&tmp); + zval *tmp = zend_stack_top(&EG(user_exception_handlers)); ZVAL_COPY_VALUE(&EG(user_exception_handler), tmp); zend_stack_del_top(&EG(user_exception_handlers)); } |