@@ -514,7 +514,7 @@ static zend_object_iterator *spl_recursive_it_get_iterator(zend_class_entry *ce,
514
514
return (zend_object_iterator * )iterator ;
515
515
}
516
516
517
- static int spl_get_iterator_from_aggregate (zval * retval , zend_class_entry * ce , zend_object * obj ) {
517
+ static zend_result spl_get_iterator_from_aggregate (zval * retval , zend_class_entry * ce , zend_object * obj ) {
518
518
zend_function * * getiterator_cache =
519
519
ce -> iterator_funcs_ptr ? & ce -> iterator_funcs_ptr -> zf_new_iterator : NULL ;
520
520
zend_call_method_with_0_params (obj , ce , getiterator_cache , "getiterator" , retval );
@@ -1301,9 +1301,9 @@ static zend_function *spl_dual_it_get_method(zend_object **object, zend_string *
1301
1301
1302
1302
#define APPENDIT_CHECK_CTOR (intern ) SPL_CHECK_CTOR(intern, AppendIterator)
1303
1303
1304
- static inline int spl_dual_it_fetch (spl_dual_it_object * intern , int check_more );
1304
+ static inline zend_result spl_dual_it_fetch (spl_dual_it_object * intern , int check_more );
1305
1305
1306
- static inline int spl_cit_check_flags (zend_long flags )
1306
+ static inline zend_result spl_cit_check_flags (zend_long flags )
1307
1307
{
1308
1308
zend_long cnt = 0 ;
1309
1309
@@ -1542,7 +1542,7 @@ static inline int spl_dual_it_valid(spl_dual_it_object *intern)
1542
1542
return intern -> inner .iterator -> funcs -> valid (intern -> inner .iterator );
1543
1543
}
1544
1544
1545
- static inline int spl_dual_it_fetch (spl_dual_it_object * intern , int check_more )
1545
+ static inline zend_result spl_dual_it_fetch (spl_dual_it_object * intern , int check_more )
1546
1546
{
1547
1547
zval * data ;
1548
1548
@@ -2874,7 +2874,7 @@ PHP_METHOD(EmptyIterator, next)
2874
2874
}
2875
2875
} /* }}} */
2876
2876
2877
- int spl_append_it_next_iterator (spl_dual_it_object * intern ) /* {{{*/
2877
+ zend_result spl_append_it_next_iterator (spl_dual_it_object * intern ) /* {{{*/
2878
2878
{
2879
2879
spl_dual_it_free (intern );
2880
2880
@@ -3051,7 +3051,7 @@ PHP_METHOD(AppendIterator, getArrayIterator)
3051
3051
RETURN_COPY_DEREF (value );
3052
3052
} /* }}} */
3053
3053
3054
- PHPAPI int spl_iterator_apply (zval * obj , spl_iterator_apply_func_t apply_func , void * puser )
3054
+ PHPAPI zend_result spl_iterator_apply (zval * obj , spl_iterator_apply_func_t apply_func , void * puser )
3055
3055
{
3056
3056
zend_object_iterator * iter ;
3057
3057
zend_class_entry * ce = Z_OBJCE_P (obj );
0 commit comments