diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-12-02 08:00:56 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-12-02 08:00:56 +0000 |
commit | e86f66b33fcf4de4bdf6e1d86275f4decec2270e (patch) | |
tree | 4bcaba9e9ea1ce9e5cc93c8f8ee705fb9a97ef9a | |
parent | 7afefea564bc6520962c9eaa457d85c19b64d13c (diff) | |
download | ruby-e86f66b33fcf4de4bdf6e1d86275f4decec2270e.tar.gz |
encoding.c: make fstring
* encoding.c (enc_name, rb_enc_name_list_i, rb_enc_aliases_enc_i):
make fstring instead of making each copies.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52859 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | encoding.c | 8 |
2 files changed, 8 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Wed Dec 2 17:00:54 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * encoding.c (enc_name, rb_enc_name_list_i, rb_enc_aliases_enc_i): + make fstring instead of making each copies. + Wed Dec 2 16:32:08 2015 Koichi Sasada <ko1@atdot.net> * iseq.h: introduce ISEQ_COMPILE_DATA() macro. diff --git a/encoding.c b/encoding.c index fe720767c2..eb777c90f3 100644 --- a/encoding.c +++ b/encoding.c @@ -1134,7 +1134,7 @@ enc_inspect(VALUE self) static VALUE enc_name(VALUE self) { - return rb_usascii_str_new2(rb_enc_name((rb_encoding*)DATA_PTR(self))); + return rb_fstring_cstr(rb_enc_name((rb_encoding*)DATA_PTR(self))); } static int @@ -1633,8 +1633,7 @@ static int rb_enc_name_list_i(st_data_t name, st_data_t idx, st_data_t arg) { VALUE ary = (VALUE)arg; - VALUE str = rb_usascii_str_new2((char *)name); - OBJ_FREEZE(str); + VALUE str = rb_fstring_cstr((char *)name); rb_ary_push(ary, str); return ST_CONTINUE; } @@ -1676,8 +1675,7 @@ rb_enc_aliases_enc_i(st_data_t name, st_data_t orig, st_data_t arg) if (STRCASECMP((char*)name, rb_enc_name(enc)) == 0) { return ST_CONTINUE; } - str = rb_usascii_str_new2(rb_enc_name(enc)); - OBJ_FREEZE(str); + str = rb_fstring_cstr(rb_enc_name(enc)); rb_ary_store(ary, idx, str); } key = rb_usascii_str_new2((char *)name); |