[前][次][番号順一覧][スレッド一覧]

ruby-changes:52812

From: nobu <ko1@a...>
Date: Fri, 12 Oct 2018 11:25:42 +0900 (JST)
Subject: [ruby-changes:52812] nobu:r65024 (trunk): Just copy tzmode

nobu	2018-10-12 11:25:37 +0900 (Fri, 12 Oct 2018)

  New Revision: 65024

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=65024

  Log:
    Just copy tzmode

  Modified files:
    trunk/time.c
Index: time.c
===================================================================
--- time.c	(revision 65023)
+++ time.c	(revision 65024)
@@ -3882,28 +3882,18 @@ time_to_s(VALUE time) https://github.com/ruby/ruby/blob/trunk/time.c#L3882
 }
 
 static VALUE
-time_add(struct time_object *tobj, VALUE torig, VALUE offset, int sign)
+time_add(const struct time_object *tobj, VALUE torig, VALUE offset, int sign)
 {
     VALUE result;
+    struct time_object *result_tobj;
+
     offset = num_exact(offset);
     if (sign < 0)
         result = time_new_timew(rb_cTime, wsub(tobj->timew, rb_time_magnify(v2w(offset))));
     else
         result = time_new_timew(rb_cTime, wadd(tobj->timew, rb_time_magnify(v2w(offset))));
-    if (TZMODE_UTC_P(tobj)) {
-	GetTimeval(result, tobj);
-        TZMODE_SET_UTC(tobj);
-    }
-    else if (TZMODE_FIXOFF_P(tobj)) {
-        VALUE off = tobj->vtm.utc_offset;
-        GetTimeval(result, tobj);
-        TZMODE_SET_FIXOFF(tobj, off);
-    }
-    else if (TZMODE_LOCALTIME_P(tobj)) {
-        VALUE zone = tobj->vtm.zone;
-        GetTimeval(result, tobj);
-        tobj->vtm.zone = zone;
-    }
+    GetTimeval(result, result_tobj);
+    TZMODE_COPY(result_tobj, tobj);
 
     return result;
 }

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]