summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-02-16 10:06:15 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-02-16 10:06:15 +0000
commit55b137904fb1760ea40cb915052ccf1c659d7f35 (patch)
treefcb283ec39fe7d00841c7b511791ad09fdb52183
parenta8dfb00fc7ccd8a52c3a60f78a1c5439ba8277d1 (diff)
downloadruby-55b137904fb1760ea40cb915052ccf1c659d7f35.tar.gz
ruby-55b137904fb1760ea40cb915052ccf1c659d7f35.tar.xz
ruby-55b137904fb1760ea40cb915052ccf1c659d7f35.zip
* string.c (str_strlen): revert r15507. [ruby-dev:33810]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15508 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--string.c3
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 4ce8b085f..7d3508490 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Feb 16 19:04:17 2008 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * string.c (str_strlen): revert r15507. [ruby-dev:33810]
+
Sat Feb 16 18:25:14 2008 NARUSE, Yui <naruse@ruby-lang.org>
* string.c (str_strlen): little more optimize.
diff --git a/string.c b/string.c
index e6670d31b..341bfd746 100644
--- a/string.c
+++ b/string.c
@@ -667,9 +667,6 @@ str_strlen(VALUE str, rb_encoding *enc)
if (len < 0) {
rb_raise(rb_eArgError, "invalid mbstring sequence");
}
- if (ENC_CODERANGE(str) != ENC_CODERANGE_VALID && enc == STR_ENC_GET(str)) {
- ENC_CODERANGE_SET(str, ENC_CODERANGE_VALID);
- }
return len;
}