diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | encoding.c | 14 |
2 files changed, 12 insertions, 9 deletions
@@ -1,3 +1,10 @@ +Fri Dec 3 04:08:59 2010 NARUSE, Yui <naruse@ruby-lang.org> + + * encoding.c (enc_alias_internal): use st_insert2 and change return + value to int. + + * encoding.c (enc_alias): follow enc_alias_internal. + Fri Dec 3 01:52:43 2010 NARUSE, Yui <naruse@ruby-lang.org> * encoding.c (enc_alias_internal): use xfree instead of free. diff --git a/encoding.c b/encoding.c index 70cc65ba3b..ac0e1ba842 100644 --- a/encoding.c +++ b/encoding.c @@ -440,23 +440,19 @@ rb_enc_unicode_p(rb_encoding *enc) * Returns copied alias name when the key is added for st_table, * else returns NULL. */ -static const char * +static int enc_alias_internal(const char *alias, int idx) { - char *name = strdup(alias); - if (st_insert(enc_table.names, (st_data_t)name, (st_data_t)idx)) { - xfree(name); - return NULL; - } - return name; + return st_insert2(enc_table.names, (st_data_t)alias, (st_data_t)idx, + (st_data_t(*)(st_data_t))strdup); } static int enc_alias(const char *alias, int idx) { if (!valid_encoding_name_p(alias)) return -1; - alias = enc_alias_internal(alias, idx); - if (alias) set_encoding_const(alias, rb_enc_from_index(idx)); + if (!enc_alias_internal(alias, idx)) + set_encoding_const(alias, rb_enc_from_index(idx)); return idx; } |