From 9fc44b8790276e5a2f3a28902ba6dee593c7ae75 Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 18 Dec 2016 11:43:51 +0000 Subject: [PATCH] re.c: use name_to_backref_number * re.c (match_backref_number): use name_to_backref_number for casts. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57110 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- re.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/re.c b/re.c index 063e6d15c8..6070dea215 100644 --- a/re.c +++ b/re.c @@ -1111,6 +1111,8 @@ match_size(VALUE match) return INT2FIX(RMATCH_REGS(match)->num_regs); } +static int name_to_backref_number(struct re_registers *, VALUE, const char*, const char*); + static int match_backref_number(VALUE match, VALUE backref) { @@ -1134,10 +1136,7 @@ match_backref_number(VALUE match, VALUE backref) break; } - num = onig_name_to_backref_number(RREGEXP_PTR(regexp), - (const unsigned char*)name, - (const unsigned char*)name + strlen(name), - regs); + num = name_to_backref_number(regs, regexp, name, name + strlen(name)); if (num < 1) { rb_raise(rb_eIndexError, "undefined group name reference: %s", name); @@ -1819,7 +1818,7 @@ static int name_to_backref_number(struct re_registers *regs, VALUE regexp, const char* name, const char* name_end) { return onig_name_to_backref_number(RREGEXP_PTR(regexp), - (const unsigned char* )name, (const unsigned char* )name_end, regs); + (const unsigned char *)name, (const unsigned char *)name_end, regs); } NORETURN(static void name_to_backref_error(VALUE name));