Skip to content

Commit 17a32a9

Browse files
committed
Refactor SplFixedArray has_dimension helper
1 parent 9ccde44 commit 17a32a9

File tree

1 file changed

+8
-11
lines changed

1 file changed

+8
-11
lines changed

ext/spl/spl_fixedarray.c

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -471,27 +471,24 @@ static void spl_fixedarray_object_unset_dimension(zend_object *object, zval *off
471471
spl_fixedarray_object_unset_dimension_helper(intern, offset);
472472
}
473473

474-
static int spl_fixedarray_object_has_dimension_helper(spl_fixedarray_object *intern, zval *offset, int check_empty)
474+
static bool spl_fixedarray_object_has_dimension_helper(spl_fixedarray_object *intern, zval *offset, bool check_empty)
475475
{
476476
zend_long index;
477-
int retval;
478477

479478
index = spl_offset_convert_to_long(offset);
480479
if (EG(exception)) {
481-
return 0;
480+
return false;
482481
}
483482

484483
if (index < 0 || index >= intern->array.size) {
485-
retval = 0;
486-
} else {
487-
if (check_empty) {
488-
retval = zend_is_true(&intern->array.elements[index]);
489-
} else {
490-
retval = Z_TYPE(intern->array.elements[index]) != IS_NULL;
491-
}
484+
return false;
485+
}
486+
487+
if (check_empty) {
488+
return zend_is_true(&intern->array.elements[index]);
492489
}
493490

494-
return retval;
491+
return Z_TYPE(intern->array.elements[index]) != IS_NULL;
495492
}
496493

497494
static int spl_fixedarray_object_has_dimension(zend_object *object, zval *offset, int check_empty)

0 commit comments

Comments
 (0)