diff options
| author | Xinchen Hui <laruence@php.net> | 2014-09-09 11:52:25 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-09-09 11:52:25 +0800 |
| commit | b625661248572f2080ba8e5d17cc994462e90f4c (patch) | |
| tree | 45604e184bae97f1a9cbd91462ddd72654688737 /Zend/zend_language_scanner.l | |
| parent | 7edd562787d1107f6169e209def9f4be6fa03d02 (diff) | |
| download | php-git-b625661248572f2080ba8e5d17cc994462e90f4c.tar.gz | |
Remove unnecessary branch/temp variable
Diffstat (limited to 'Zend/zend_language_scanner.l')
| -rw-r--r-- | Zend/zend_language_scanner.l | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l index 83ebe40498..dc91090823 100644 --- a/Zend/zend_language_scanner.l +++ b/Zend/zend_language_scanner.l @@ -556,7 +556,6 @@ ZEND_API zend_op_array *compile_file(zend_file_handle *file_handle, int type TSR zend_lex_state original_lex_state; zend_op_array *op_array = (zend_op_array *) emalloc(sizeof(zend_op_array)); zend_op_array *original_active_op_array = CG(active_op_array); - zend_op_array *retval=NULL; int compiler_result; zend_bool compilation_successful=0; zval retval_zv; @@ -566,8 +565,6 @@ ZEND_API zend_op_array *compile_file(zend_file_handle *file_handle, int type TSR zend_save_lexical_state(&original_lex_state TSRMLS_CC); - retval = op_array; /* success oriented */ - if (open_file_for_scanning(file_handle TSRMLS_CC)==FAILURE) { if (type==ZEND_REQUIRE) { zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, file_handle->filename TSRMLS_CC); @@ -596,18 +593,17 @@ ZEND_API zend_op_array *compile_file(zend_file_handle *file_handle, int type TSR compilation_successful=1; } - if (retval) { - CG(active_op_array) = original_active_op_array; - if (compilation_successful) { - pass_two(op_array TSRMLS_CC); - zend_release_labels(0 TSRMLS_CC); - } else { - efree_size(op_array, sizeof(zend_op_array)); - retval = NULL; - } + CG(active_op_array) = original_active_op_array; + if (compilation_successful) { + pass_two(op_array TSRMLS_CC); + zend_release_labels(0 TSRMLS_CC); + } else { + efree_size(op_array, sizeof(zend_op_array)); + op_array = NULL; } + zend_restore_lexical_state(&original_lex_state TSRMLS_CC); - return retval; + return op_array; } |