#include "time64.h"
-static const int days_in_month[2][12] = {
+static const char days_in_month[2][12] = {
{31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31},
{31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31},
};
-static const int julian_days_by_month[2][12] = {
+static const short julian_days_by_month[2][12] = {
{0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334},
{0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335},
};
-static const int length_of_year[2] = { 365, 366 };
+static const short length_of_year[2] = { 365, 366 };
/* Number of days in a 400 year Gregorian cycle */
static const Year years_in_gregorian_cycle = 400;
/* 28 year calendar cycle between 2010 and 2037 */
#define SOLAR_CYCLE_LENGTH 28
-static const int safe_years[SOLAR_CYCLE_LENGTH] = {
+static const short safe_years[SOLAR_CYCLE_LENGTH] = {
2016, 2017, 2018, 2019,
2020, 2021, 2022, 2023,
2024, 2025, 2026, 2027,
2012, 2013, 2014, 2015
};
-static const int dow_year_start[SOLAR_CYCLE_LENGTH] = {
+static const char dow_year_start[SOLAR_CYCLE_LENGTH] = {
5, 0, 1, 2, /* 0 2016 - 2019 */
3, 5, 6, 0, /* 4 */
1, 3, 4, 5, /* 8 */
#define CHEAT_YEARS 108
#define IS_LEAP(n) ((!(((n) + 1900) % 400) || (!(((n) + 1900) % 4) && (((n) + 1900) % 100))) != 0)
+#undef WRAP /* some <termios.h> define this */
#define WRAP(a,b,m) ((a) = ((a) < 0 ) ? ((b)--, (a) + (m)) : (a))
#ifdef USE_SYSTEM_LOCALTIME
static void S_copy_little_tm_to_big_TM(const struct tm *src, struct TM *dest) {
- if( src == NULL ) {
- memset(dest, 0, sizeof(*dest));
- }
- else {
-# ifdef USE_TM64
- dest->tm_sec = src->tm_sec;
- dest->tm_min = src->tm_min;
- dest->tm_hour = src->tm_hour;
- dest->tm_mday = src->tm_mday;
- dest->tm_mon = src->tm_mon;
- dest->tm_year = (Year)src->tm_year;
- dest->tm_wday = src->tm_wday;
- dest->tm_yday = src->tm_yday;
- dest->tm_isdst = src->tm_isdst;
-
-# ifdef HAS_TM_TM_GMTOFF
- dest->tm_gmtoff = src->tm_gmtoff;
-# endif
-
-# ifdef HAS_TM_TM_ZONE
- dest->tm_zone = src->tm_zone;
-# endif
-
-# else
- /* They're the same type */
- memcpy(dest, src, sizeof(*dest));
-# endif
- }
-}
-
+ assert(src);
+ assert(dest);
+#ifdef USE_TM64
+ dest->tm_sec = src->tm_sec;
+ dest->tm_min = src->tm_min;
+ dest->tm_hour = src->tm_hour;
+ dest->tm_mday = src->tm_mday;
+ dest->tm_mon = src->tm_mon;
+ dest->tm_year = (Year)src->tm_year;
+ dest->tm_wday = src->tm_wday;
+ dest->tm_yday = src->tm_yday;
+ dest->tm_isdst = src->tm_isdst;
+
+# ifdef HAS_TM_TM_GMTOFF
+ dest->tm_gmtoff = src->tm_gmtoff;
+# endif
+
+# ifdef HAS_TM_TM_ZONE
+ dest->tm_zone = src->tm_zone;
+# endif
-static void S_copy_big_TM_to_little_tm(const struct TM *src, struct tm *dest) {
- if( src == NULL ) {
- memset(dest, 0, sizeof(*dest));
- }
- else {
-# ifdef USE_TM64
- dest->tm_sec = src->tm_sec;
- dest->tm_min = src->tm_min;
- dest->tm_hour = src->tm_hour;
- dest->tm_mday = src->tm_mday;
- dest->tm_mon = src->tm_mon;
- dest->tm_year = (int)src->tm_year;
- dest->tm_wday = src->tm_wday;
- dest->tm_yday = src->tm_yday;
- dest->tm_isdst = src->tm_isdst;
-
-# ifdef HAS_TM_TM_GMTOFF
- dest->tm_gmtoff = src->tm_gmtoff;
-# endif
-
-# ifdef HAS_TM_TM_ZONE
- dest->tm_zone = src->tm_zone;
-# endif
-
-# else
- /* They're the same type */
- memcpy(dest, src, sizeof(*dest));
-# endif
- }
+#else
+ /* They're the same type */
+ memcpy(dest, src, sizeof(*dest));
+#endif
}
#ifndef HAS_LOCALTIME_R
/* Simulate localtime_r() to the best of our ability */
static struct tm * S_localtime_r(const time_t *clock, struct tm *result) {
- dTHX; /* in case the following is defined as Perl_my_localtime(aTHX_ ...) */
+#ifdef __VMS
+ dTHX; /* the following is defined as Perl_my_localtime(aTHX_ ...) */
+#endif
const struct tm *static_result = localtime(clock);
assert(result != NULL);
#ifndef HAS_GMTIME_R
/* Simulate gmtime_r() to the best of our ability */
static struct tm * S_gmtime_r(const time_t *clock, struct tm *result) {
- dTHX; /* in case the following is defined as Perl_my_gmtime(aTHX_ ...) */
+#ifdef __VMS
+ dTHX; /* the following is defined as Perl_my_localtime(aTHX_ ...) */
+#endif
const struct tm *static_result = gmtime(clock);
assert(result != NULL);
p->tm_isdst = 0;
#ifdef HAS_TM_TM_ZONE
- p->tm_zone = "UTC";
+ p->tm_zone = (char *)"UTC";
#endif
- v_tm_sec = (int)(time % 60);
- time /= 60;
- v_tm_min = (int)(time % 60);
- time /= 60;
- v_tm_hour = (int)(time % 24);
- time /= 24;
+ v_tm_sec = (int)Perl_fmod(time, 60.0);
+ time = time >= 0 ? Perl_floor(time / 60.0) : Perl_ceil(time / 60.0);
+ v_tm_min = (int)Perl_fmod(time, 60.0);
+ time = time >= 0 ? Perl_floor(time / 60.0) : Perl_ceil(time / 60.0);
+ v_tm_hour = (int)Perl_fmod(time, 24.0);
+ time = time >= 0 ? Perl_floor(time / 24.0) : Perl_ceil(time / 24.0);
v_tm_tday = time;
WRAP (v_tm_sec, v_tm_min, 60);
WRAP (v_tm_min, v_tm_hour, 60);
WRAP (v_tm_hour, v_tm_tday, 24);
- v_tm_wday = (int)((v_tm_tday + 4) % 7);
+ v_tm_wday = (int)Perl_fmod((v_tm_tday + 4.0), 7.0);
if (v_tm_wday < 0)
v_tm_wday += 7;
m = v_tm_tday;
if (m >= 0) {
/* Gregorian cycles, this is huge optimization for distant times */
- cycles = (int)(m / (Time64_T) days_in_gregorian_cycle);
+ cycles = (int)Perl_floor(m / (Time64_T) days_in_gregorian_cycle);
if( cycles ) {
m -= (cycles * (Time64_T) days_in_gregorian_cycle);
year += (cycles * years_in_gregorian_cycle);
year--;
/* Gregorian cycles */
- cycles = (int)((m / (Time64_T) days_in_gregorian_cycle) + 1);
+ cycles = (int)Perl_ceil((m / (Time64_T) days_in_gregorian_cycle) + 1);
if( cycles ) {
m -= (cycles * (Time64_T) days_in_gregorian_cycle);
year += (cycles * years_in_gregorian_cycle);
}
-struct TM *S_localtime64_r (const Time64_T *time, struct TM *local_tm)
+static struct TM *S_localtime64_r (const Time64_T *time, struct TM *local_tm)
{
time_t safe_time;
struct tm safe_date;
/* GMT is Jan 1st, xx01 year, but localtime is still Dec 31st
in a non-leap xx00. There is one point in the cycle
we can't account for which the safe xx00 year is a leap
- year. So we need to correct for Dec 31st comming out as
+ year. So we need to correct for Dec 31st coming out as
the 366th day of the year.
*/
if( !IS_LEAP(local_tm->tm_year) && local_tm->tm_yday == 365 )
https://perl5.git.perl.org / perl5.git / blobdiff