com php-src: Just return, no need for RETURN_NULL(): Zend/zend_closures.c
| From: | Tjerk Anne Meesters | Date: | Tue, 19 Aug 2014 23:11:11 +0000 |
| Subject: | com php-src: Just return, no need for RETURN_NULL(): Zend/zend_closures.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81162@lists.php.net to get a copy of this message | ||
Commit: 342265badb7247ed088e409922b570b191ccf188
Author: Andrea Faulds <ajf@ajf.me> Wed, 20 Aug 2014 00:11:11 +0100
Parents: 594a768fef63201857fa92b2827d804f91bb5c8f
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=342265badb7247ed088e409922b570b191ccf188
Log:
Just return, no need for RETURN_NULL()
Changed paths:
M Zend/zend_closures.c
Diff:
diff --git a/Zend/zend_closures.c b/Zend/zend_closures.c
index 03fcf59..4954325 100644
--- a/Zend/zend_closures.c
+++ b/Zend/zend_closures.c
@@ -79,7 +79,7 @@ ZEND_METHOD(Closure, call) /* {{{ */
zend_function my_function;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o*", &newthis, &my_params,
&my_param_count) == FAILURE) {
- RETURN_NULL();
+ return;
}
zclosure = getThis();
@@ -87,7 +87,7 @@ ZEND_METHOD(Closure, call) /* {{{ */
if (closure->func.common.fn_flags & ZEND_ACC_STATIC) {
zend_error(E_WARNING, "Cannot bind an instance to a static closure");
- RETURN_NULL();
+ return;
}
if (closure->func.type == ZEND_INTERNAL_FUNCTION) {
@@ -95,7 +95,7 @@ ZEND_METHOD(Closure, call) /* {{{ */
if ((closure->func.common.fn_flags & ZEND_ACC_STATIC) == 0 &&
!instanceof_function(Z_OBJCE_P(newthis), closure->func.common.scope TSRMLS_CC)) {
zend_error(E_WARNING, "Cannot bind function %s::%s to object of class %s",
closure->func.common.scope->name->val, closure->func.common.function_name->val,
Z_OBJCE_P(newthis)->name->val);
- RETURN_NULL();
+ return;
}
}