* string.c (scan_once): need no encoding compatibility check.

  it's done inside of re_reg_seach().

* string.c (rb_str_split_m): ditto.

* re.c (rb_reg_regsub): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14269 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 4 deletions

diff --git a/string.c b/string.c
index 76a0049530..62f5c31380 100644
--- a/string.c
+++ b/string.c
@@ -4129,9 +4129,6 @@ rb_str_split_m(int argc, VALUE *argv, VALUE str)
 	int last_null = 0;
 	struct re_registers *regs;
 
-	if (RREGEXP(spat)->len != 0) {
-	    enc = rb_enc_check(str, spat);
-	}
 	while ((end = rb_reg_search(spat, str, start, 0)) >= 0) {
 	    regs = RMATCH(rb_backref_get())->regs;
 	    if (start == end && BEG(0) == END(0)) {
@@ -4733,7 +4730,7 @@ scan_once(VALUE str, VALUE pat, long *start)
     struct re_registers *regs;
     long i;
 
-    enc = rb_enc_check(str, pat);
+    enc = rb_enc_get(str);
     if (rb_reg_search(pat, str, *start, 0) >= 0) {
 	match = rb_backref_get();
 	regs = RMATCH(match)->regs;