mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-21 16:00:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary result variable

Browse Source 
Instead directly use return_value. Hopefully this also works
around the "may be uninitialized" warning...
This commit is contained in:
Nikita Popov 2020-01-20 11:05:34 +01:00
parent 6811222422
commit 0fbdc5a378
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ext/standard/array.c
View File

@ -6011,7 +6011,6 @@ PHP_FUNCTION(array_reduce)
zval *input; zval *input;
zval args[2]; zval args[2];
zval *operand; zval *operand;
zval result;
zval retval; zval retval;
zend_fcall_info fci; zend_fcall_info fci;
zend_fcall_info_cache fci_cache = empty_fcall_info_cache; zend_fcall_info_cache fci_cache = empty_fcall_info_cache;
@ -6027,9 +6026,9 @@ PHP_FUNCTION(array_reduce)
if (ZEND_NUM_ARGS() > 2) { if (ZEND_NUM_ARGS() > 2) {
ZVAL_COPY(&result, initial); ZVAL_COPY(return_value, initial);
} else { } else {
ZVAL_NULL(&result); ZVAL_NULL(return_value);
} }
/* (zval **)input points to an element of argument stack /* (zval **)input points to an element of argument stack
@ -6038,7 +6037,6 @@ PHP_FUNCTION(array_reduce)
htbl = Z_ARRVAL_P(input); htbl = Z_ARRVAL_P(input);
if (zend_hash_num_elements(htbl) == 0) { if (zend_hash_num_elements(htbl) == 0) {
ZVAL_COPY_VALUE(return_value, &result);
zend_release_fcall_info_cache(&fci_cache); zend_release_fcall_info_cache(&fci_cache);
return; return;
} }
@ -6048,14 +6046,14 @@ PHP_FUNCTION(array_reduce)
fci.no_separation = 0; fci.no_separation = 0;
ZEND_HASH_FOREACH_VAL(htbl, operand) { ZEND_HASH_FOREACH_VAL(htbl, operand) {
ZVAL_COPY_VALUE(&args[0], &result); ZVAL_COPY_VALUE(&args[0], return_value);
ZVAL_COPY(&args[1], operand); ZVAL_COPY(&args[1], operand);
fci.params = args; fci.params = args;
if (zend_call_function(&fci, &fci_cache) == SUCCESS && Z_TYPE(retval) != IS_UNDEF) { if (zend_call_function(&fci, &fci_cache) == SUCCESS && Z_TYPE(retval) != IS_UNDEF) {
zval_ptr_dtor(&args[1]); zval_ptr_dtor(&args[1]);
zval_ptr_dtor(&args[0]); zval_ptr_dtor(&args[0]);
ZVAL_COPY_VALUE(&result, &retval); ZVAL_COPY_VALUE(return_value, &retval);
} else { } else {
zval_ptr_dtor(&args[1]); zval_ptr_dtor(&args[1]);
zval_ptr_dtor(&args[0]); zval_ptr_dtor(&args[0]);
@ -6064,7 +6062,6 @@ PHP_FUNCTION(array_reduce)
} ZEND_HASH_FOREACH_END(); } ZEND_HASH_FOREACH_END();
zend_release_fcall_info_cache(&fci_cache); zend_release_fcall_info_cache(&fci_cache);
RETURN_COPY_VALUE(&result);
} }
/* }}} */ /* }}} */