From 83bdc2f00c4565a091d88399e5a315a96f6afed6 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Tue, 9 Nov 2021 15:12:02 +0900 Subject: Simplify default values of `Time.at` [Bug #18293] --- time.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'time.c') 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)); -- cgit v1.2.1