admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

time.c: remove duplicated UTC condition check.

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2022-01-15 18:24:39 +09:00
parent 171d32c007
commit 475b868b72
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-time/src/time.c
+8 -11
View File
@@ -476,24 +476,21 @@ time_mktime(mrb_state *mrb, mrb_int ayear, mrb_int amonth, mrb_int aday,
nowtime.tm_sec = (int)asec;
nowtime.tm_isdst = -1;
time_t (*mk)(struct tm*);
if (timezone == MRB_TIMEZONE_UTC) {
nowsecs = timegm(&nowtime);
mk = timegm;
}
else {
nowsecs = mktime(&nowtime);
mk = mktime;
}
nowsecs = (*mk)(&nowtime);
if (nowsecs == (time_t)-1) {
nowtime.tm_sec += 1;
if (timezone == MRB_TIMEZONE_UTC) {
nowsecs = timegm(&nowtime);
}
else {
nowsecs = mktime(&nowtime);
}
if (nowsecs != 0) {
nowtime.tm_sec += 1; /* maybe Epoch-1 sec */
nowsecs = (*mk)(&nowtime);
if (nowsecs != 0) { /* check if Epoch */
mrb_raise(mrb, E_ARGUMENT_ERROR, "Not a valid time");
}
nowsecs = (time_t)-1;
nowsecs = (time_t)-1; /* valid Epoch-1 */
}
return time_alloc_time(mrb, nowsecs, ausec, timezone);