diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-20 19:21:26 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-20 19:21:26 +0000 |
commit | 13f20ccda7aeb82750b020d2c8bf4f8c6fc72d37 (patch) | |
tree | d9edf5d04d71604ad3013249ab42fad3b7280d81 /encoding.c | |
parent | 1de486b6001f36525e8cd8d536f7dfd876a7213f (diff) | |
download | ruby-13f20ccda7aeb82750b020d2c8bf4f8c6fc72d37.tar.gz |
* encoding.c (rb_ascii8bit_encoding): use ENCINDEX_ASCII.
* encoding.c, include/ruby/encoding.h (rb_ascii8bit_encindex):
added.
* encoding.c (rb_locale_encoding): use rb_usascii_encoding().
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16498 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'encoding.c')
-rw-r--r-- | encoding.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/encoding.c b/encoding.c index bb400e1ef0..e1824f557f 100644 --- a/encoding.c +++ b/encoding.c @@ -912,7 +912,13 @@ rb_ascii8bit_encoding(void) if (!enc_table.list) { rb_enc_init(); } - return enc_table.list[0].enc; + return enc_table.list[ENCINDEX_ASCII].enc; +} + +int +rb_ascii8bit_encindex(void) +{ + return ENCINDEX_ASCII; } rb_encoding * @@ -946,7 +952,7 @@ rb_locale_encoding(void) int idx; if (NIL_P(charmap)) - idx = rb_enc_find_index("US-ASCII"); + return rb_usascii_encoding(); else idx = rb_enc_find_index(StringValueCStr(charmap)); if (idx < 0) |