summaryrefslogtreecommitdiff
path: root/re.c
diff options
context:
space:
mode:
authorYusuke Endoh <mame@ruby-lang.org>2022-10-24 18:12:49 +0900
committerYusuke Endoh <mame@ruby-lang.org>2022-10-24 18:13:26 +0900
commitef01482f64df9bcd7adb2b64ca6ab96f55f42c43 (patch)
tree57cc478ac53f66b0a0e69d65af3eada6931c16ce /re.c
parent8873c420d34d4573a153dd0d107a0ada099f4d26 (diff)
downloadruby-ef01482f64df9bcd7adb2b64ca6ab96f55f42c43.tar.gz
Refactor timeout-related code in re.c a little
Diffstat (limited to 're.c')
-rw-r--r--re.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/re.c b/re.c
index c1214f392a..b21def1b7b 100644
--- a/re.c
+++ b/re.c
@@ -3848,11 +3848,11 @@ rb_reg_initialize_m(int argc, VALUE *argv, VALUE self)
regex_t *reg = RREGEXP_PTR(self);
{
- double limit = NIL_P(timeout) ? 0.0 : NUM2DBL(timeout);
- if (!NIL_P(timeout) && limit <= 0) {
+ double timeout_d = NIL_P(timeout) ? 0.0 : NUM2DBL(timeout);
+ if (!NIL_P(timeout) && timeout_d <= 0) {
rb_raise(rb_eArgError, "invalid timeout: %"PRIsVALUE, timeout);
}
- double2hrtime(&reg->timelimit, limit);
+ double2hrtime(&reg->timelimit, timeout_d);
}
return self;
@@ -4476,18 +4476,18 @@ rb_reg_s_timeout_get(VALUE dummy)
*/
static VALUE
-rb_reg_s_timeout_set(VALUE dummy, VALUE limit)
+rb_reg_s_timeout_set(VALUE dummy, VALUE timeout)
{
- double timeout = NIL_P(limit) ? 0.0 : NUM2DBL(limit);
+ double timeout_d = NIL_P(timeout) ? 0.0 : NUM2DBL(timeout);
rb_ractor_ensure_main_ractor("can not access Regexp.timeout from non-main Ractors");
- if (!NIL_P(limit) && timeout <= 0) {
- rb_raise(rb_eArgError, "invalid timeout: %"PRIsVALUE, limit);
+ if (!NIL_P(timeout) && timeout_d <= 0) {
+ rb_raise(rb_eArgError, "invalid timeout: %"PRIsVALUE, timeout);
}
- double2hrtime(&rb_reg_match_time_limit, timeout);
+ double2hrtime(&rb_reg_match_time_limit, timeout_d);
- return limit;
+ return timeout;
}
/*