diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | encoding.c | 9 | ||||
| -rw-r--r-- | include/ruby/encoding.h | 4 |
3 files changed, 13 insertions, 6 deletions
@@ -1,3 +1,9 @@ +Wed May 21 07:22:01 2008 NARUSE, Yui <naruse@ruby-lang.org> + + * encoding.c, include/ruby/encoding.h + (rb_enc_associate, rb_enc_associate_index): + returns obj. [ruby-dev:34778] + Wed May 21 04:20:20 2008 NARUSE, Yui <naruse@ruby-lang.org> * encoding.c (rb_ascii8bit_encoding): use ENCINDEX_ASCII. diff --git a/encoding.c b/encoding.c index e1824f557f..20d47b1e6f 100644 --- a/encoding.c +++ b/encoding.c @@ -564,10 +564,10 @@ rb_enc_set_index(VALUE obj, int idx) return; } -void +VALUE rb_enc_associate_index(VALUE obj, int idx) { -// enc_check_capable(obj); +/* enc_check_capable(obj);*/ if (rb_enc_get_index(obj) == idx) return; if (!ENC_CODERANGE_ASCIIONLY(obj) || @@ -575,12 +575,13 @@ rb_enc_associate_index(VALUE obj, int idx) ENC_CODERANGE_CLEAR(obj); } rb_enc_set_index(obj, idx); + return obj; } -void +VALUE rb_enc_associate(VALUE obj, rb_encoding *enc) { - rb_enc_associate_index(obj, rb_enc_to_index(enc)); + return rb_enc_associate_index(obj, rb_enc_to_index(enc)); } rb_encoding* diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h index ade293ec6f..e67b834c0b 100644 --- a/include/ruby/encoding.h +++ b/include/ruby/encoding.h @@ -83,8 +83,8 @@ rb_encoding* rb_to_encoding(VALUE); rb_encoding* rb_enc_get(VALUE); rb_encoding* rb_enc_compatible(VALUE,VALUE); rb_encoding* rb_enc_check(VALUE,VALUE); -void rb_enc_associate_index(VALUE, int); -void rb_enc_associate(VALUE, rb_encoding*); +VALUE rb_enc_associate_index(VALUE, int); +VALUE rb_enc_associate(VALUE, rb_encoding*); void rb_enc_copy(VALUE dst, VALUE src); VALUE rb_enc_str_new(const char*, long, rb_encoding*); |