From 33ecb05d5118ec54f4b6efdd53d8f5b2f666ead8 Mon Sep 17 00:00:00 2001 From: akr Date: Mon, 17 Dec 2007 08:08:23 +0000 Subject: * 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 --- string.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'string.c') 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; -- cgit v1.2.3