1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure time object meets a given condition [Bug #17042]

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2020-07-23 11:48:59 +09:00
parent afacf85e44
commit caf565f7bf
No known key found for this signature in database
GPG Key ID: 7CD2805BFA3770C6
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
time.c
View File

@ -1765,6 +1765,14 @@ static VALUE time_get_tm(VALUE, struct time_object *);
time_get_tm((time), (tobj)); \ time_get_tm((time), (tobj)); \
} \ } \
} while (0) } while (0)
#define MAKE_TM_ENSURE(time, tobj, cond) \
do { \
MAKE_TM(time, tobj); \
if (!(cond)) { \
VALUE zone = (tobj)->vtm.zone; \
if (!NIL_P(zone)) zone_localtime(zone, (time)); \
} \
} while (0)
static void static void
time_mark(void *ptr) time_mark(void *ptr)
@ -4593,11 +4601,7 @@ time_wday(VALUE time)
struct time_object *tobj; struct time_object *tobj;
GetTimeval(time, tobj); GetTimeval(time, tobj);
MAKE_TM(time, tobj); MAKE_TM_ENSURE(time, tobj, tobj->vtm.wday != VTM_WDAY_INITVAL);
if (tobj->vtm.wday == VTM_WDAY_INITVAL) {
VALUE zone = tobj->vtm.zone;
if (!NIL_P(zone)) zone_localtime(zone, time);
}
return INT2FIX((int)tobj->vtm.wday); return INT2FIX((int)tobj->vtm.wday);
} }
@ -4733,11 +4737,7 @@ time_yday(VALUE time)
struct time_object *tobj; struct time_object *tobj;
GetTimeval(time, tobj); GetTimeval(time, tobj);
MAKE_TM(time, tobj); MAKE_TM_ENSURE(time, tobj, tobj->vtm.yday != 0);
if (tobj->vtm.yday == 0) {
VALUE zone = tobj->vtm.zone;
if (!NIL_P(zone)) zone_localtime(zone, time);
}
return INT2FIX(tobj->vtm.yday); return INT2FIX(tobj->vtm.yday);
} }
@ -5109,11 +5109,7 @@ time_strftime(VALUE time, VALUE format)
VALUE tmp; VALUE tmp;
GetTimeval(time, tobj); GetTimeval(time, tobj);
if (tobj->vtm.yday == 0) { MAKE_TM_ENSURE(time, tobj, tobj->vtm.yday != 0);
VALUE zone = tobj->vtm.zone;
if (!NIL_P(zone)) zone_localtime(zone, time);
}
MAKE_TM(time, tobj);
StringValue(format); StringValue(format);
if (!rb_enc_str_asciicompat_p(format)) { if (!rb_enc_str_asciicompat_p(format)) {
rb_raise(rb_eArgError, "format should have ASCII compatible encoding"); rb_raise(rb_eArgError, "format should have ASCII compatible encoding");