@@ -1009,7 +1009,7 @@ PHPAPI zend_long php_parse_date(const char *string, zend_long *now)
1009
1009
PHP_FUNCTION (strtotime )
1010
1010
{
1011
1011
zend_string * times ;
1012
- int error1 , epoch_does_not_fit_in_zend_long ;
1012
+ int parse_error , epoch_does_not_fit_in_zend_long ;
1013
1013
timelib_error_container * error ;
1014
1014
zend_long preset_ts , ts ;
1015
1015
zend_bool preset_ts_is_null = 1 ;
@@ -1037,9 +1037,9 @@ PHP_FUNCTION(strtotime)
1037
1037
1038
1038
t = timelib_strtotime (ZSTR_VAL (times ), ZSTR_LEN (times ), & error ,
1039
1039
DATE_TIMEZONEDB , php_date_parse_tzfile_wrapper );
1040
- error1 = error -> error_count ;
1040
+ parse_error = error -> error_count ;
1041
1041
timelib_error_container_dtor (error );
1042
- if (error1 ) {
1042
+ if (parse_error ) {
1043
1043
timelib_time_dtor (now );
1044
1044
timelib_time_dtor (t );
1045
1045
RETURN_FALSE ;
@@ -1052,7 +1052,6 @@ PHP_FUNCTION(strtotime)
1052
1052
timelib_time_dtor (now );
1053
1053
timelib_time_dtor (t );
1054
1054
1055
- /* Seconds since epoch must fit in a zend_long */
1056
1055
if (epoch_does_not_fit_in_zend_long ) {
1057
1056
php_error_docref (NULL , E_WARNING , "Epoch doesn't fit in a PHP integer" );
1058
1057
RETURN_FALSE ;
@@ -1130,7 +1129,6 @@ PHPAPI void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gmt)
1130
1129
/* Clean up and return */
1131
1130
ts = timelib_date_to_int (now , & epoch_does_not_fit_in_zend_long );
1132
1131
1133
- /* Seconds since epoch must fit in a zend_long */
1134
1132
if (epoch_does_not_fit_in_zend_long ) {
1135
1133
timelib_time_dtor (now );
1136
1134
php_error_docref (NULL , E_WARNING , "Epoch doesn't fit in a PHP integer" );
@@ -3336,7 +3334,6 @@ PHP_FUNCTION(date_timestamp_get)
3336
3334
3337
3335
timestamp = timelib_date_to_int (dateobj -> time , & epoch_does_not_fit_in_zend_long );
3338
3336
3339
- /* Seconds since epoch must fit in a zend_long */
3340
3337
if (epoch_does_not_fit_in_zend_long ) {
3341
3338
zend_value_error ("Epoch doesn't fit in a PHP integer" );
3342
3339
RETURN_THROWS ();
0 commit comments