summaryrefslogtreecommitdiff
path: root/time.c
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2021-11-09 15:12:02 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2021-11-10 17:42:18 +0900
commit83bdc2f00c4565a091d88399e5a315a96f6afed6 (patch)
tree70c27707e918014d242383e1689d0d2e85da1b75 /time.c
parentcc33d07f46559bfd11098c6b39c7c59faa892af9 (diff)
downloadruby-83bdc2f00c4565a091d88399e5a315a96f6afed6.tar.gz
Simplify default values of `Time.at` [Bug #18293]
Diffstat (limited to 'time.c')
-rw-r--r--time.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/time.c b/time.c
index 6fa4047e29..9ecc09347c 100644
--- a/time.c
+++ b/time.c
@@ -2678,13 +2678,13 @@ get_scale(VALUE unit)
}
static VALUE
-time_s_at(rb_execution_context_t *ec, VALUE klass, VALUE time, VALUE subsec, VALUE unit, VALUE zone, VALUE nosubsec, VALUE nounit)
+time_s_at(rb_execution_context_t *ec, VALUE klass, VALUE time, VALUE subsec, VALUE unit, VALUE zone)
{
VALUE t;
wideval_t timew;
- if (!RTEST(nosubsec)) {
- int scale = !RTEST(nounit) ? get_scale(unit) : 1000000;
+ if (!NIL_P(subsec)) {
+ int scale = get_scale(unit);
time = num_exact(time);
t = num_exact(subsec);
timew = wadd(rb_time_magnify(v2w(time)), wmulquoll(v2w(t), TIME_SCALE, scale));