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 | 1fea057c4c5c8abce40df55e71cc20457b0cf2fe (patch) | |
| tree | d9edf5d04d71604ad3013249ab42fad3b7280d81 /encoding.c | |
| parent | 8eeac1072c96192f35456fcf3f88e3b8fb446ce7 (diff) | |
| download | ruby-1fea057c4c5c8abce40df55e71cc20457b0cf2fe.tar.gz ruby-1fea057c4c5c8abce40df55e71cc20457b0cf2fe.tar.xz ruby-1fea057c4c5c8abce40df55e71cc20457b0cf2fe.zip | |
* 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: http://svn.ruby-lang.org/repos/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 bb400e1ef..e1824f557 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) |