diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-11-09 06:52:02 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-11-09 06:52:02 +0000 |
| commit | 7bfed9613cadef52574df8b3c7e1e6324d7230c4 (patch) | |
| tree | 1add2733878b7d81265934e12c3c9468f1899fba /encoding.c | |
| parent | 03d68e3ba44e457669b8115546355ef73b95f338 (diff) | |
* encoding.c (enc_check_encoding, rb_set_primary_encoding): ENCODING
is no longer in FL_USERS flags.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13852 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'encoding.c')
| -rw-r--r-- | encoding.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/encoding.c b/encoding.c index 15a2398f05..1ee24c2286 100644 --- a/encoding.c +++ b/encoding.c @@ -48,7 +48,6 @@ enc_new(rb_encoding *encoding) VALUE rb_enc_from_encoding(rb_encoding *encoding) { - VALUE enc; if (!encoding) return 0; if (enc_initialized_p(encoding)) return ENC_FROM_ENCODING(encoding); @@ -63,7 +62,7 @@ enc_check_encoding(VALUE obj) RDATA(obj)->dmark != enc_mark) { return -1; } - index = rb_enc_get_index(obj); + index = rb_enc_to_index(RDATA(obj)->data); if (rb_enc_from_index(index) != RDATA(obj)->data) return -1; return index; @@ -619,8 +618,7 @@ get_primary_encoding(VALUE klass) void rb_set_primary_encoding(VALUE encoding) { - rb_to_encoding(encoding); - primary_encoding_index = ENCODING_GET(encoding); + primary_encoding_index = rb_enc_to_index(rb_to_encoding(encoding)); } static void |