@@ -4294,7 +4294,7 @@ PHP_FUNCTION(timezone_transitions_get)
4294
4294
{
4295
4295
zval * object , element ;
4296
4296
php_timezone_obj * tzobj ;
4297
- int begin = 0 ;
4297
+ uint64_t begin = 0 ;
4298
4298
bool found ;
4299
4299
zend_long timestamp_begin = ZEND_LONG_MIN , timestamp_end = INT32_MAX ;
4300
4300
@@ -4383,8 +4383,7 @@ PHP_FUNCTION(timezone_transitions_get)
4383
4383
add_nominal ();
4384
4384
}
4385
4385
} else {
4386
- unsigned int i ;
4387
- for (i = begin ; i < tzobj -> tzi .tz -> bit64 .timecnt ; ++ i ) {
4386
+ for (uint64_t i = begin ; i < tzobj -> tzi .tz -> bit64 .timecnt ; ++ i ) {
4388
4387
if (tzobj -> tzi .tz -> trans [i ] < timestamp_end ) {
4389
4388
add (i , tzobj -> tzi .tz -> trans [i ]);
4390
4389
} else {
@@ -4393,7 +4392,6 @@ PHP_FUNCTION(timezone_transitions_get)
4393
4392
}
4394
4393
}
4395
4394
if (tzobj -> tzi .tz -> posix_info && tzobj -> tzi .tz -> posix_info -> dst_end ) {
4396
- int i , j ;
4397
4395
timelib_sll start_y , end_y , dummy_m , dummy_d ;
4398
4396
timelib_sll last_transition_ts = tzobj -> tzi .tz -> trans [tzobj -> tzi .tz -> bit64 .timecnt - 1 ];
4399
4397
@@ -4403,12 +4401,12 @@ PHP_FUNCTION(timezone_transitions_get)
4403
4401
/* Find out year for final boundary timestamp */
4404
4402
timelib_unixtime2date (timestamp_end , & end_y , & dummy_m , & dummy_d );
4405
4403
4406
- for (i = start_y ; i <= end_y ; i ++ ) {
4404
+ for (timelib_sll i = start_y ; i <= end_y ; i ++ ) {
4407
4405
timelib_posix_transitions transitions = { 0 };
4408
4406
4409
4407
timelib_get_transitions_for_year (tzobj -> tzi .tz , i , & transitions );
4410
4408
4411
- for (j = 0 ; j < transitions .count ; j ++ ) {
4409
+ for (size_t j = 0 ; j < transitions .count ; j ++ ) {
4412
4410
if (transitions .times [j ] <= last_transition_ts ) {
4413
4411
continue ;
4414
4412
}
0 commit comments