Skip to content

Commit 66750f1

Browse files
devnexendevnexen
committed
general signatures discrepencies
1 parent fc16285 commit 66750f1

24 files changed

+32
-29
lines changed

‎UPGRADING.INTERNALS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ PHP 8.4 INTERNALS UPGRADE NOTES
2626
Z_PARAM_FUNC_EX2 was added as well with the same arguments as Z_PARAM_FUNC_EX
2727
plus an additional argument free_trampoline.
2828

29+
* The zend_object_iterator_funcs valid member has changed its signature from
30+
int(*)(zend_object_iterator *) to zend_result(*)(zend_object_iterator *) to
31+
be more in line with what callbacks are returning.
32+
2933
========================
3034
2. Build system changes
3135
========================

‎Zend/zend_generators.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1018,7 +1018,7 @@ static void zend_generator_iterator_dtor(zend_object_iterator *iterator) /* {{{
10181018
}
10191019
/* }}} */
10201020

1021-
static int zend_generator_iterator_valid(zend_object_iterator *iterator) /* {{{ */
1021+
static zend_result zend_generator_iterator_valid(zend_object_iterator *iterator) /* {{{ */
10221022
{
10231023
zend_generator *generator = (zend_generator*)Z_OBJ(iterator->data);
10241024

‎Zend/zend_interfaces.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,7 @@ ZEND_API HashTable *zend_user_it_get_gc(zend_object_iterator *_iter, zval **tabl
198198

199199
static const zend_object_iterator_funcs zend_interface_iterator_funcs_iterator = {
200200
zend_user_it_dtor,
201-
// FIXME: Adjust the actual function prototype in zend_object_iterator_funcs
202-
(int (*)(zend_object_iterator *)) zend_user_it_valid,
201+
zend_user_it_valid,
203202
zend_user_it_get_current_data,
204203
zend_user_it_get_current_key,
205204
zend_user_it_move_forward,

‎Zend/zend_iterators.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ typedef struct _zend_object_iterator_funcs {
3131
void (*dtor)(zend_object_iterator *iter);
3232

3333
/* check for end of iteration (FAILURE or SUCCESS if data is valid) */
34-
int (*valid)(zend_object_iterator *iter);
34+
zend_result (*valid)(zend_object_iterator *iter);
3535

3636
/* fetch the item data for the current element */
3737
zval *(*get_current_data)(zend_object_iterator *iter);

‎Zend/zend_multibyte.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ ZEND_API const zend_encoding *zend_multibyte_get_script_encoding(void)
170170
return LANG_SCNG(script_encoding);
171171
}
172172

173-
ZEND_API int zend_multibyte_set_script_encoding(const zend_encoding **encoding_list, size_t encoding_list_size)
173+
ZEND_API zend_result zend_multibyte_set_script_encoding(const zend_encoding **encoding_list, size_t encoding_list_size)
174174
{
175175
if (CG(script_encoding_list)) {
176176
free((char*)CG(script_encoding_list));

‎Zend/zend_weakrefs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,7 @@ static void zend_weakmap_iterator_dtor(zend_object_iterator *obj_iter)
597597
zval_ptr_dtor(&iter->it.data);
598598
}
599599

600-
static int zend_weakmap_iterator_valid(zend_object_iterator *obj_iter)
600+
static zend_result zend_weakmap_iterator_valid(zend_object_iterator *obj_iter)
601601
{
602602
zend_weakmap_iterator *iter = (zend_weakmap_iterator *) obj_iter;
603603
zend_weakmap *wm = zend_weakmap_fetch(&iter->it.data);

‎ext/com_dotnet/com_iterator.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ static void com_iter_dtor(zend_object_iterator *iter)
4949
zval_ptr_dtor(&I->zdata);
5050
}
5151

52-
static int com_iter_valid(zend_object_iterator *iter)
52+
static zend_result com_iter_valid(zend_object_iterator *iter)
5353
{
5454
struct php_com_iterator *I = (struct php_com_iterator*)Z_PTR(iter->data);
5555

‎ext/com_dotnet/com_saproxy.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ static void saproxy_iter_dtor(zend_object_iterator *iter)
455455
efree(I);
456456
}
457457

458-
static int saproxy_iter_valid(zend_object_iterator *iter)
458+
static zend_result saproxy_iter_valid(zend_object_iterator *iter)
459459
{
460460
php_com_saproxy_iter *I = (php_com_saproxy_iter*)Z_PTR(iter->data);
461461

‎ext/date/php_date.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1575,7 +1575,7 @@ static void date_period_it_dtor(zend_object_iterator *iter)
15751575
/* }}} */
15761576

15771577
/* {{{ date_period_it_has_more */
1578-
static int date_period_it_has_more(zend_object_iterator *iter)
1578+
static zend_result date_period_it_has_more(zend_object_iterator *iter)
15791579
{
15801580
date_period_it *iterator = (date_period_it *)iter;
15811581
php_period_obj *object = Z_PHPPERIOD_P(&iterator->intern.data);

‎ext/dom/dom_iterators.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ static void php_dom_iterator_dtor(zend_object_iterator *iter) /* {{{ */
132132
}
133133
/* }}} */
134134

135-
static int php_dom_iterator_valid(zend_object_iterator *iter) /* {{{ */
135+
static zend_result php_dom_iterator_valid(zend_object_iterator *iter) /* {{{ */
136136
{
137137

138138
php_dom_iterator *iterator = (php_dom_iterator *)iter;

‎ext/ffi/ffi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1933,7 +1933,7 @@ static void zend_ffi_cdata_it_dtor(zend_object_iterator *iter) /* {{{ */
19331933
}
19341934
/* }}} */
19351935

1936-
static int zend_ffi_cdata_it_valid(zend_object_iterator *it) /* {{{ */
1936+
static zend_result zend_ffi_cdata_it_valid(zend_object_iterator *it) /* {{{ */
19371937
{
19381938
zend_ffi_cdata_iterator *iter = (zend_ffi_cdata_iterator*)it;
19391939
zend_ffi_cdata *cdata = (zend_ffi_cdata*)Z_OBJ(iter->it.data);

‎ext/gd/gd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4058,7 +4058,7 @@ static gdIOCtx *create_stream_context(php_stream *stream, int close_stream) {
40584058
return ctx;
40594059
}
40604060

4061-
static gdIOCtx *create_output_context() {
4061+
static gdIOCtx *create_output_context(void) {
40624062
gdIOCtx *ctx = ecalloc(1, sizeof(gdIOCtx));
40634063

40644064
ctx->putC = _php_image_output_putc;

‎ext/intl/common/common_enum.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ void zoi_with_current_dtor(zend_object_iterator *iter)
5656
}
5757
}
5858

59-
U_CFUNC int zoi_with_current_valid(zend_object_iterator *iter)
59+
U_CFUNC zend_result zoi_with_current_valid(zend_object_iterator *iter)
6060
{
6161
return Z_ISUNDEF(((zoi_with_current*)iter)->current)? FAILURE : SUCCESS;
6262
}

‎ext/intl/common/common_enum.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ extern zend_class_entry *IntlIterator_ce_ptr;
6868
extern zend_object_handlers IntlIterator_handlers;
6969

7070
U_CFUNC void zoi_with_current_dtor(zend_object_iterator *iter);
71-
U_CFUNC int zoi_with_current_valid(zend_object_iterator *iter);
71+
U_CFUNC zend_result zoi_with_current_valid(zend_object_iterator *iter);
7272
U_CFUNC zval *zoi_with_current_get_current_data(zend_object_iterator *iter);
7373
U_CFUNC void zoi_with_current_invalidate_current(zend_object_iterator *iter);
7474

‎ext/intl/resourcebundle/resourcebundle_iterator.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ static void resourcebundle_iterator_dtor( zend_object_iterator *iter )
7777
/* }}} */
7878

7979
/* {{{ resourcebundle_iterator_has_more */
80-
static int resourcebundle_iterator_has_more( zend_object_iterator *iter )
80+
static zend_result resourcebundle_iterator_has_more( zend_object_iterator *iter )
8181
{
8282
ResourceBundle_iterator *iterator = (ResourceBundle_iterator *) iter;
8383
return (iterator->i < iterator->length) ? SUCCESS : FAILURE;

‎ext/mysqli/mysqli_result_iterator.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ static void php_mysqli_result_iterator_dtor(zend_object_iterator *iter)
7474
/* }}} */
7575

7676
/* {{{ */
77-
static int php_mysqli_result_iterator_valid(zend_object_iterator *iter)
77+
static zend_result php_mysqli_result_iterator_valid(zend_object_iterator *iter)
7878
{
7979
php_mysqli_result_iterator *iterator = (php_mysqli_result_iterator*) iter;
8080

‎ext/pdo/pdo_stmt.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2159,7 +2159,7 @@ static void pdo_stmt_iter_dtor(zend_object_iterator *iter)
21592159
}
21602160
}
21612161

2162-
static int pdo_stmt_iter_valid(zend_object_iterator *iter)
2162+
static zend_result pdo_stmt_iter_valid(zend_object_iterator *iter)
21632163
{
21642164
struct php_pdo_iterator *I = (struct php_pdo_iterator*)iter;
21652165

‎ext/simplexml/simplexml.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ static xmlNodePtr php_sxe_reset_iterator(php_sxe_object *sxe, int use_data);
4747
static xmlNodePtr php_sxe_reset_iterator_no_clear_iter_data(php_sxe_object *sxe, int use_data);
4848
static xmlNodePtr php_sxe_iterator_fetch(php_sxe_object *sxe, xmlNodePtr node, int use_data);
4949
static void php_sxe_iterator_dtor(zend_object_iterator *iter);
50-
static int php_sxe_iterator_valid(zend_object_iterator *iter);
50+
static zend_result php_sxe_iterator_valid(zend_object_iterator *iter);
5151
static zval *php_sxe_iterator_current_data(zend_object_iterator *iter);
5252
static void php_sxe_iterator_current_key(zend_object_iterator *iter, zval *key);
5353
static void php_sxe_iterator_move_forward(zend_object_iterator *iter);
@@ -2462,7 +2462,7 @@ static void php_sxe_iterator_dtor(zend_object_iterator *iter) /* {{{ */
24622462
}
24632463
/* }}} */
24642464

2465-
static int php_sxe_iterator_valid(zend_object_iterator *iter) /* {{{ */
2465+
static zend_result php_sxe_iterator_valid(zend_object_iterator *iter) /* {{{ */
24662466
{
24672467
php_sxe_iterator *iterator = (php_sxe_iterator *)iter;
24682468

‎ext/spl/spl_array.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1544,7 +1544,7 @@ static void spl_array_it_dtor(zend_object_iterator *iter) /* {{{ */
15441544
}
15451545
/* }}} */
15461546

1547-
static int spl_array_it_valid(zend_object_iterator *iter) /* {{{ */
1547+
static zend_result spl_array_it_valid(zend_object_iterator *iter) /* {{{ */
15481548
{
15491549
spl_array_object *object = Z_SPLARRAY_P(&iter->data);
15501550
HashTable *aht = spl_array_get_hash_table(object);

‎ext/spl/spl_directory.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1627,7 +1627,7 @@ PHP_METHOD(GlobIterator, count)
16271627

16281628
/* {{{ forward declarations to the iterator handlers */
16291629
static void spl_filesystem_dir_it_dtor(zend_object_iterator *iter);
1630-
static int spl_filesystem_dir_it_valid(zend_object_iterator *iter);
1630+
static zend_result spl_filesystem_dir_it_valid(zend_object_iterator *iter);
16311631
static zval *spl_filesystem_dir_it_current_data(zend_object_iterator *iter);
16321632
static void spl_filesystem_dir_it_current_key(zend_object_iterator *iter, zval *key);
16331633
static void spl_filesystem_dir_it_move_forward(zend_object_iterator *iter);
@@ -1677,7 +1677,7 @@ static void spl_filesystem_dir_it_dtor(zend_object_iterator *iter)
16771677
/* }}} */
16781678

16791679
/* {{{ spl_filesystem_dir_it_valid */
1680-
static int spl_filesystem_dir_it_valid(zend_object_iterator *iter)
1680+
static zend_result spl_filesystem_dir_it_valid(zend_object_iterator *iter)
16811681
{
16821682
spl_filesystem_object *object = spl_filesystem_iterator_to_object((spl_filesystem_iterator *)iter);
16831683

‎ext/spl/spl_dllist.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -875,7 +875,7 @@ static void spl_dllist_it_rewind(zend_object_iterator *iter) /* {{{ */
875875
}
876876
/* }}} */
877877

878-
static int spl_dllist_it_valid(zend_object_iterator *iter) /* {{{ */
878+
static zend_result spl_dllist_it_valid(zend_object_iterator *iter) /* {{{ */
879879
{
880880
spl_dllist_it *iterator = (spl_dllist_it *)iter;
881881
spl_ptr_llist_element *element = iterator->traverse_pointer;

‎ext/spl/spl_fixedarray.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -895,7 +895,7 @@ static void spl_fixedarray_it_rewind(zend_object_iterator *iter)
895895
((spl_fixedarray_it*)iter)->current = 0;
896896
}
897897

898-
static int spl_fixedarray_it_valid(zend_object_iterator *iter)
898+
static zend_result spl_fixedarray_it_valid(zend_object_iterator *iter)
899899
{
900900
spl_fixedarray_it *iterator = (spl_fixedarray_it*)iter;
901901
spl_fixedarray_object *object = Z_SPLFIXEDARRAY_P(&iter->data);

‎ext/spl/spl_heap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -896,7 +896,7 @@ static void spl_heap_it_rewind(zend_object_iterator *iter) /* {{{ */
896896
}
897897
/* }}} */
898898

899-
static int spl_heap_it_valid(zend_object_iterator *iter) /* {{{ */
899+
static zend_result spl_heap_it_valid(zend_object_iterator *iter) /* {{{ */
900900
{
901901
return ((Z_SPLHEAP_P(&iter->data))->heap->count != 0 ? SUCCESS : FAILURE);
902902
}

‎ext/spl/spl_iterators.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ static void spl_recursive_it_dtor(zend_object_iterator *_iter)
210210
zval_ptr_dtor(&iter->intern.data);
211211
}
212212

213-
static int spl_recursive_it_valid_ex(spl_recursive_it_object *object, zval *zthis)
213+
static zend_result spl_recursive_it_valid_ex(spl_recursive_it_object *object, zval *zthis)
214214
{
215215
zend_object_iterator *sub_iter;
216216
int level = object->level;
@@ -232,7 +232,7 @@ static int spl_recursive_it_valid_ex(spl_recursive_it_object *object, zval *zthi
232232
return FAILURE;
233233
}
234234

235-
static int spl_recursive_it_valid(zend_object_iterator *iter)
235+
static zend_result spl_recursive_it_valid(zend_object_iterator *iter)
236236
{
237237
return spl_recursive_it_valid_ex(Z_SPLRECURSIVE_IT_P(&iter->data), &iter->data);
238238
}
@@ -1525,7 +1525,7 @@ static inline void spl_dual_it_rewind(spl_dual_it_object *intern)
15251525
}
15261526
}
15271527

1528-
static inline int spl_dual_it_valid(spl_dual_it_object *intern)
1528+
static inline zend_result spl_dual_it_valid(spl_dual_it_object *intern)
15291529
{
15301530
if (!intern->inner.iterator) {
15311531
return FAILURE;
@@ -2184,7 +2184,7 @@ static zend_object *spl_dual_it_new(zend_class_entry *class_type)
21842184
}
21852185
/* }}} */
21862186

2187-
static inline int spl_limit_it_valid(spl_dual_it_object *intern)
2187+
static inline zend_result spl_limit_it_valid(spl_dual_it_object *intern)
21882188
{
21892189
/* FAILURE / SUCCESS */
21902190
if (intern->u.limit.count != -1 && intern->current.pos >= intern->u.limit.offset + intern->u.limit.count) {

0 commit comments

Comments
 (0)