archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

zend_stack_top() now returns pointer directly

Browse source
This commit is contained in:
Nikita Popov 2014-04-30 20:48:02 +02:00
parent 5a03efe279
commit e0247de147
9 changed files with 505 additions and 543 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Zend/zend_builtin_functions.c
View file

@ -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));
}