com php-src: Remove superfluous branches: Zend/zend_generator s.c
| From: | Bob Weinand | Date: | Sun, 20 Sep 2015 00:59:30 +0000 |
| Subject: | com php-src: Remove superfluous branches: Zend/zend_generator s.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-89083@lists.php.net to get a copy of this message | ||
Commit: c9988a1e698154dbf168792635c77496a29a6cc6
Author: Bob Weinand <bobwei9@hotmail.com> Sun, 20 Sep 2015 02:59:30 +0200
Parents: 95dbe1d03e0b7609af65235928123527c917f6a8
Branches: PHP-7.0
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c9988a1e698154dbf168792635c77496a29a6cc6
Log:
Remove superfluous branches
Changed paths:
M Zend/zend_generators.c
Diff:
diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c
index dfcc134..3ffa82e 100644
--- a/Zend/zend_generators.c
+++ b/Zend/zend_generators.c
@@ -65,15 +65,11 @@ static void zend_generator_cleanup_unfinished_execution(zend_generator *generato
ZEND_API void zend_generator_close(zend_generator *generator, zend_bool finished_execution) /* {{{
*/
{
- if (EXPECTED(Z_TYPE(generator->value) != IS_UNDEF)) {
- zval_ptr_dtor(&generator->value);
- ZVAL_UNDEF(&generator->value);
- }
+ zval_ptr_dtor(&generator->value);
+ ZVAL_UNDEF(&generator->value);
- if (EXPECTED(Z_TYPE(generator->key) != IS_UNDEF)) {
- zval_ptr_dtor(&generator->key);
- ZVAL_UNDEF(&generator->key);
- }
+ zval_ptr_dtor(&generator->key);
+ ZVAL_UNDEF(&generator->key);
if (UNEXPECTED(Z_TYPE(generator->values) != IS_UNDEF)) {
zval_ptr_dtor(&generator->values);
@@ -931,7 +927,7 @@ ZEND_METHOD(Generator, getReturn)
if (zend_parse_parameters_none() == FAILURE) {
return;
- }
+ }
generator = (zend_generator *) Z_OBJ_P(getThis());