kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

rename an argument of calc_wday.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64494 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2018-08-21 14:40:18 +00:00
parent 682a661e1c
commit efb002cd7a
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
time.c
View file

@ -1337,13 +1337,13 @@ static const int compat_leap_month_table[7] = {
}; };
static int static int
calc_wday(int year, int month, int day) calc_wday(int year_mod400, int month, int day)
{ {
int a, y, m; int a, y, m;
int wday; int wday;
a = (14 - month) / 12; a = (14 - month) / 12;
y = year + 4800 - a; y = year_mod400 + 4800 - a;
m = month + 12 * a - 3; m = month + 12 * a - 3;
wday = day + (153*m+2)/5 + 365*y + y/4 - y/100 + y/400 + 2; wday = day + (153*m+2)/5 + 365*y + y/4 - y/100 + y/400 + 2;
wday = wday % 7; wday = wday % 7;
@ -1359,7 +1359,7 @@ guess_local_offset(struct vtm *vtm_utc, int *isdst_ret, VALUE *zone_ret)
time_t t; time_t t;
struct vtm vtm2; struct vtm vtm2;
VALUE timev; VALUE timev;
int y, wday; int year_mod400, wday;
/* Daylight Saving Time was introduced in 1916. /* Daylight Saving Time was introduced in 1916.
* So we don't need to care about DST before that. */ * So we don't need to care about DST before that. */
@ -1401,9 +1401,9 @@ guess_local_offset(struct vtm *vtm_utc, int *isdst_ret, VALUE *zone_ret)
vtm2 = *vtm_utc; vtm2 = *vtm_utc;
/* guess using a year before 2038. */ /* guess using a year before 2038. */
y = NUM2INT(modv(vtm_utc->year, INT2FIX(400))); year_mod400 = NUM2INT(modv(vtm_utc->year, INT2FIX(400)));
wday = calc_wday(y, vtm_utc->mon, 1); wday = calc_wday(year_mod400, vtm_utc->mon, 1);
if (vtm_utc->mon == 2 && leap_year_p(y)) if (vtm_utc->mon == 2 && leap_year_p(year_mod400))
vtm2.year = INT2FIX(compat_leap_month_table[wday]); vtm2.year = INT2FIX(compat_leap_month_table[wday]);
else else
vtm2.year = INT2FIX(compat_common_month_table[vtm_utc->mon-1][wday]); vtm2.year = INT2FIX(compat_common_month_table[vtm_utc->mon-1][wday]);