diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-02-12 14:29:51 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-02-12 14:29:51 +0400 |
| commit | 4e66abad54b25ca367fcb6da78524e3c4024e2a0 (patch) | |
| tree | 77632bac13854d5ffcfb9ce2f92ea0ce461db44e /Zend/zend.c | |
| parent | e2ea9a7319c2d7f84d174cf76524c9b92c1541d1 (diff) | |
| download | php-git-4e66abad54b25ca367fcb6da78524e3c4024e2a0.tar.gz | |
Use better data structures (incomplete) - refactored return_value handling
Diffstat (limited to 'Zend/zend.c')
| -rw-r--r-- | Zend/zend.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index b3e05f68ad..fed9ebb34a 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -1277,7 +1277,6 @@ ZEND_API int zend_execute_scripts(int type TSRMLS_DC, zval *retval, int file_cou int i; zend_file_handle *file_handle; zend_op_array *orig_op_array = EG(active_op_array); -//??? zval **orig_retval_ptr_ptr = EG(return_value_ptr_ptr); long orig_interactive = CG(interactive); va_start(files, file_count); @@ -1301,8 +1300,7 @@ ZEND_API int zend_execute_scripts(int type TSRMLS_DC, zval *retval, int file_cou } zend_destroy_file_handle(file_handle TSRMLS_CC); if (EG(active_op_array)) { -//??? EG(return_value_ptr_ptr) = retval ? retval : NULL; - zend_execute(EG(active_op_array) TSRMLS_CC); + zend_execute(EG(active_op_array), retval TSRMLS_CC); zend_exception_restore(TSRMLS_C); if (EG(exception)) { if (Z_TYPE(EG(user_exception_handler)) != IS_UNDEF) { @@ -1334,14 +1332,12 @@ ZEND_API int zend_execute_scripts(int type TSRMLS_DC, zval *retval, int file_cou } else if (type==ZEND_REQUIRE) { va_end(files); EG(active_op_array) = orig_op_array; -//??? EG(return_value_ptr_ptr) = orig_retval_ptr_ptr; CG(interactive) = orig_interactive; return FAILURE; } } va_end(files); EG(active_op_array) = orig_op_array; -//??? EG(return_value_ptr_ptr) = orig_retval_ptr_ptr; CG(interactive) = orig_interactive; return SUCCESS; |