From 6927c6aa1ec3e92ccc9fd1b5a8f2ea634f50fb02 Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 1 Jul 2009 12:11:53 +0000
Subject: * include/ruby/intern.h (rb_time_num_new): declared.

* time.c (nsec2timev): extracted from time_new_internal.
  (time_new_internal): change argument to VALUE.
  (rb_time_new): follow the argument change.
  (rb_time_nano_new): ditto.
  (rb_time_num_new): new function.

* ext/socket/ancdata.c (ancillary_timestamp): use rb_time_num_new to
  represent struct bintime preciously.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@23924 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 time.c | 36 +++++++++++++++++++++++++++++-------
 1 file changed, 29 insertions(+), 7 deletions(-)

(limited to 'time.c')

diff --git a/time.c b/time.c
index d856fc6f4..0a9ed630b 100644
--- a/time.c
+++ b/time.c
@@ -51,6 +51,7 @@ static VALUE time_utc_offset _((VALUE));
 static long obj2long(VALUE obj);
 static VALUE obj2vint(VALUE obj);
 static int month_arg(VALUE arg);
+static void validate_utc_offset(VALUE utc_offset);
 static void validate_vtm(struct vtm *vtm);
 
 static VALUE time_gmtime(VALUE);
@@ -1451,18 +1452,24 @@ time_overflow_p(time_t *secp, long *nsecp)
     *nsecp = nsec;
 }
 
+static VALUE nsec2timev(time_t sec, long nsec)
+{
+    struct timespec ts;
+    time_overflow_p(&sec, &nsec);
+    ts.tv_sec = sec;
+    ts.tv_nsec = nsec;
+    return timespec2timev(&ts);
+}
+
 static VALUE
-time_new_internal(VALUE klass, time_t sec, long nsec)
+time_new_internal(VALUE klass, VALUE timev)
 {
     VALUE time = time_s_alloc(klass);
     struct time_object *tobj;
     struct timespec ts;
 
     GetTimeval(time, tobj);
-    time_overflow_p(&sec, &nsec);
-    ts.tv_sec = sec;
-    ts.tv_nsec = nsec;
-    tobj->timev = timespec2timev(&ts);
+    tobj->timev = num_exact(timev);
 
     return time;
 }
@@ -1470,13 +1477,28 @@ time_new_internal(VALUE klass, time_t sec, long nsec)
 VALUE
 rb_time_new(time_t sec, long usec)
 {
-    return time_new_internal(rb_cTime, sec, usec * 1000);
+    return time_new_internal(rb_cTime, nsec2timev(sec, usec * 1000));
 }
 
 VALUE
 rb_time_nano_new(time_t sec, long nsec)
 {
-    return time_new_internal(rb_cTime, sec, nsec);
+    return time_new_internal(rb_cTime, nsec2timev(sec, nsec));
+}
+
+VALUE
+rb_time_num_new(VALUE timev, VALUE off)
+{
+    VALUE time = time_new_internal(rb_cTime, timev);
+
+    if (!NIL_P(off)) {
+        off = utc_offset_arg(off);
+        validate_utc_offset(off);
+        time_set_utc_offset(time, off);
+        return time;
+    }
+
+    return time;
 }
 
 static VALUE
-- 
cgit