summaryrefslogtreecommitdiff
path: root/string.c
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-13 22:31:46 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-13 22:31:46 +0000
commit28eb7acf2c8c8b883090617599ec3439dc55e8e9 (patch)
tree7496039ad360314637012c421394cadb0f6a95c8 /string.c
parent9d37857e2b8a4b227e52ff8438e44968d6249f95 (diff)
* string.c (rb_external_str_new_with_enc): change evaluatioin order
for speed. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22297 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'string.c')
-rw-r--r--string.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/string.c b/string.c
index 8eb83efcec..28410a448c 100644
--- a/string.c
+++ b/string.c
@@ -538,8 +538,8 @@ rb_external_str_new_with_enc(const char *ptr, long len, rb_encoding *eenc)
VALUE str;
str = rb_tainted_str_new(ptr, len);
- if (rb_enc_str_coderange(str) != ENC_CODERANGE_7BIT &&
- eenc == rb_usascii_encoding()) {
+ if (eenc == rb_usascii_encoding() &&
+ rb_enc_str_coderange(str) != ENC_CODERANGE_7BIT) {
rb_enc_associate(str, rb_ascii8bit_encoding());
return str;
}