summaryrefslogtreecommitdiff
path: root/string.c
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-17 08:08:23 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-17 08:08:23 +0000
commit33ecb05d5118ec54f4b6efdd53d8f5b2f666ead8 (patch)
tree127a5f32859affe2489a65d7603078a30529ee6d /string.c
parent0d0a8a55fc6650a9b1dee937f66f9dc1690a2579 (diff)
* string.c (rb_enc_str_asciionly_p): use rb_enc_str_coderange.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14263 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'string.c')
-rw-r--r--string.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/string.c b/string.c
index 85ea099ea5..8cc6954c02 100644
--- a/string.c
+++ b/string.c
@@ -133,16 +133,10 @@ int rb_enc_str_asciionly_p(VALUE str)
{
rb_encoding *enc = rb_enc_get(str);
- if (rb_enc_asciicompat(enc) &&
- rb_enc_str_coderange(str) == ENC_CODERANGE_7BIT) {
- char *ptr = RSTRING_PTR(str);
- long len = RSTRING_LEN(str);
- long i;
- for (i = 0; i < len; i++)
- if (ptr[i] & 0x80)
- return Qfalse;
+ if (!rb_enc_asciicompat(enc))
+ return Qfalse;
+ else if (rb_enc_str_coderange(str) == ENC_CODERANGE_7BIT)
return Qtrue;
- }
return Qfalse;
}
@@ -1410,7 +1404,6 @@ static VALUE
rb_str_casecmp(VALUE str1, VALUE str2)
{
long len;
- int retval;
rb_encoding *enc;
char *p1, *p1end, *p2, *p2end;