summaryrefslogtreecommitdiff
path: root/time.c
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-08-21 14:40:18 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-08-21 14:40:18 +0000
commitefb002cd7aa60c0885d33d42846e19d311fec95e (patch)
tree1355a5dd19d1f47be3c128ae796698604640ad89 /time.c
parent682a661e1c4d536f38c12e5f4613e4107e10c75b (diff)
rename an argument of calc_wday.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64494 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'time.c')
-rw-r--r--time.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/time.c b/time.c
index e15ecc1c7b..3b454720dc 100644
--- a/time.c
+++ b/time.c
@@ -1337,13 +1337,13 @@ static const int compat_leap_month_table[7] = {
};
static int
-calc_wday(int year, int month, int day)
+calc_wday(int year_mod400, int month, int day)
{
int a, y, m;
int wday;
a = (14 - month) / 12;
- y = year + 4800 - a;
+ y = year_mod400 + 4800 - a;
m = month + 12 * a - 3;
wday = day + (153*m+2)/5 + 365*y + y/4 - y/100 + y/400 + 2;
wday = wday % 7;
@@ -1359,7 +1359,7 @@ guess_local_offset(struct vtm *vtm_utc, int *isdst_ret, VALUE *zone_ret)
time_t t;
struct vtm vtm2;
VALUE timev;
- int y, wday;
+ int year_mod400, wday;
/* Daylight Saving Time was introduced in 1916.
* 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;
/* guess using a year before 2038. */
- y = NUM2INT(modv(vtm_utc->year, INT2FIX(400)));
- wday = calc_wday(y, vtm_utc->mon, 1);
- if (vtm_utc->mon == 2 && leap_year_p(y))
+ year_mod400 = NUM2INT(modv(vtm_utc->year, INT2FIX(400)));
+ wday = calc_wday(year_mod400, vtm_utc->mon, 1);
+ if (vtm_utc->mon == 2 && leap_year_p(year_mod400))
vtm2.year = INT2FIX(compat_leap_month_table[wday]);
else
vtm2.year = INT2FIX(compat_common_month_table[vtm_utc->mon-1][wday]);