archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

ext/spl: Remove useless obj field from spl_iterator_apply_info

Browse source
This commit is contained in:
Gina Peter Banyard 2025-01-05 00:48:07 +00:00
parent 73f52dc729
commit e547fe40df
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ext/spl/spl_iterators.c
View file

@ -3059,7 +3059,6 @@ PHP_FUNCTION(iterator_count)
/* }}} */ /* }}} */
typedef struct { typedef struct {
zval *obj;
zend_long count; zend_long count;
zend_fcall_info fci; zend_fcall_info fci;
zend_fcall_info_cache fcc; zend_fcall_info_cache fcc;
@ -3082,16 +3081,17 @@ static int spl_iterator_func_apply(zend_object_iterator *iter, void *puser) /* {
/* {{{ Calls a function for every element in an iterator */ /* {{{ Calls a function for every element in an iterator */
PHP_FUNCTION(iterator_apply) PHP_FUNCTION(iterator_apply)
{ {
zval *traversable;
spl_iterator_apply_info apply_info; spl_iterator_apply_info apply_info;
/* The HashTable is used to determine positional arguments */ /* The HashTable is used to determine positional arguments */
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Of|h!", &apply_info.obj, zend_ce_traversable, if (zend_parse_parameters(ZEND_NUM_ARGS(), "Of|h!", &traversable, zend_ce_traversable,
&apply_info.fci, &apply_info.fcc, &apply_info.fci.named_params) == FAILURE) { &apply_info.fci, &apply_info.fcc, &apply_info.fci.named_params) == FAILURE) {
RETURN_THROWS(); RETURN_THROWS();
} }
apply_info.count = 0; apply_info.count = 0;
if (spl_iterator_apply(apply_info.obj, spl_iterator_func_apply, (void*)&apply_info) == FAILURE) { if (spl_iterator_apply(traversable, spl_iterator_func_apply, (void*)&apply_info) == FAILURE) {
return; return;
} }
RETURN_LONG(apply_info.count); RETURN_LONG(apply_info.count);