diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-10-12 14:47:23 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-10-12 14:47:23 +0000 |
| commit | d410639a6d422e0ae032f049ccfbbbb45b312d6f (patch) | |
| tree | 7f967d0f5320dea31975c536b705cedc1db23db5 /ext/iconv | |
| parent | 17c48bebf87828abeb5be91ed8ba0a2b72bc5479 (diff) | |
* compile.c (iseq_build_body), error.c (set_syserr, get_syserr),
(syserr_initialize), gc.c (define_final, rb_gc_copy_finalizer),
(run_final), hash.c (rb_hash_aref, rb_hash_lookup2),
(rb_hash_fetch_m, rb_hash_clear, rb_hash_aset, eql_i),
iseq.c (iseq_load, iseq_data_to_ary), marshal.c (r_symlink),
thread.c (rb_thread_local_aref),
variable.c (generic_ivar_remove, ivar_get, rb_const_get_0),
(rb_cvar_get), vm.c (rb_vm_check_redefinition_opt_method),
vm_insnhelper.c (vm_get_ev_const), vm_method.c (remove_method),
ext/iconv/iconv.c (map_charset): use st_data_t.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29462 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/iconv')
| -rw-r--r-- | ext/iconv/iconv.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index ff30c4e13a..d2cb4ddf11 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -164,10 +164,11 @@ map_charset(VALUE *code) VALUE val = StringValue(*code); if (RHASH_SIZE(charset_map)) { + st_data_t data; VALUE key = rb_funcall2(val, rb_intern("downcase"), 0, 0); StringValuePtr(key); - if (st_lookup(RHASH_TBL(charset_map), key, &val)) { - *code = val; + if (st_lookup(RHASH_TBL(charset_map), key, &data)) { + *code = (VALUE)data; } } return StringValuePtr(*code); |