diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-02 19:19:47 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-02 19:19:47 +0000 |
commit | e59b9e9e43881a818f21a2a5cf6a702d42142c75 (patch) | |
tree | b8b172d0c0be3d2de2d3e6c3aa72d9f4eab50e85 /encoding.c | |
parent | 3010758245f755dbb9e936c173a700612387b208 (diff) | |
download | ruby-e59b9e9e43881a818f21a2a5cf6a702d42142c75.tar.gz |
* encoding.c (enc_alias_internal): use st_insert2 and change return
value to int.
* encoding.c (enc_alias): follow enc_alias_internal.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30060 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'encoding.c')
-rw-r--r-- | encoding.c | 14 |
1 files changed, 5 insertions, 9 deletions
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; } |