From 911b1c6b06a89603dfc9976a021b85e505221b7b Mon Sep 17 00:00:00 2001 From: naruse Date: Tue, 10 Nov 2015 05:36:47 +0000 Subject: * time.c (rb_time_timespec_new): swap utc and localtime to generate gmt flag by INT_MAX - gmtoff. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52519 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ time.c | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index eeb22b2ebf..324d594e51 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Nov 10 14:34:09 2015 NARUSE, Yui + + * time.c (rb_time_timespec_new): swap utc and localtime + to generate gmt flag by INT_MAX - gmtoff. + Tue Nov 10 14:01:59 2015 Nobuyoshi Nakada * hash.c (rb_hash_{le,lt,ge,gt}): new methods, Hash#<=, Hash#<, diff --git a/time.c b/time.c index aad4cb4ad1..603fe8bf63 100644 --- a/time.c +++ b/time.c @@ -2315,7 +2315,7 @@ rb_time_nano_new(time_t sec, long nsec) /** * Returns a time object with UTC/localtime/fixed offset * - * offset is -86400 < fixoff < 86400 or INT_MAX (UTC) or INT_MAX-1 (localtime) + * offset is -86400 < fixoff < 86400 or INT_MAX (localtime) or INT_MAX-1 (utc) */ VALUE rb_time_timespec_new(const struct timespec *ts, int offset) @@ -2327,12 +2327,12 @@ rb_time_timespec_new(const struct timespec *ts, int offset) GetTimeval(time, tobj); TIME_SET_FIXOFF(tobj, INT2FIX(offset)); } - else if (offset == INT_MAX) { /* UTC */ + else if (offset == INT_MAX) { /* localtime */ + } + else if (offset == INT_MAX-1) { /* UTC */ GetTimeval(time, tobj); TIME_SET_UTC(tobj); } - else if (offset == INT_MAX-1) { /* localtime */ - } else { rb_raise(rb_eArgError, "utc_offset out of range"); } -- cgit v1.2.3