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 | ff1ac7a941f0e3e749050ecd6a154957a2fcdb2b (patch) | |
| tree | 1add2733878b7d81265934e12c3c9468f1899fba | |
| parent | 7f9ba49581b80dd3b7ecf419070f697fdb246530 (diff) | |
| download | ruby-ff1ac7a941f0e3e749050ecd6a154957a2fcdb2b.tar.gz ruby-ff1ac7a941f0e3e749050ecd6a154957a2fcdb2b.tar.xz ruby-ff1ac7a941f0e3e749050ecd6a154957a2fcdb2b.zip | |
* encoding.c (enc_check_encoding, rb_set_primary_encoding): ENCODING
is no longer in FL_USERS flags.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13852 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | encoding.c | 6 |
2 files changed, 7 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Fri Nov 9 15:52:00 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * encoding.c (enc_check_encoding, rb_set_primary_encoding): ENCODING + is no longer in FL_USERS flags. + Fri Nov 9 15:20:13 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> * string.c (rb_str_squeeze_bang): initialize squeezing table if no diff --git a/encoding.c b/encoding.c index 15a2398f0..1ee24c228 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 |