aboutsummaryrefslogtreecommitdiffstats
path: root/re.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-12-18 11:43:51 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-12-18 11:43:51 +0000
commit3fc5d43f89ebf10bd57b60329960239fab5faa32 (patch)
tree7dc51fe1eb63ed4e631d0b6ac64366f1d2c5464b /re.c
parentd89832e278cd5f6efdd3bef0df077d2f3d93849d (diff)
downloadruby-3fc5d43f89ebf10bd57b60329960239fab5faa32.tar.gz
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
Diffstat (limited to 're.c')
-rw-r--r--re.c9
1 files 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));