1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/iconv/iconv.c (map_charset): always ensure code is a String.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5252 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2003-12-22 12:59:28 +00:00
parent 65fed5dad3
commit 54524ed8f0
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Mon Dec 22 21:59:24 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/iconv/iconv.c (map_charset): always ensure code is a String.
Mon Dec 22 21:15:29 2003 Nobuyoshi Nakada <nobu@ruby-lang.org> Mon Dec 22 21:15:29 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
* class.c (rb_mod_init_copy): always copy singleton class. * class.c (rb_mod_init_copy): always copy singleton class.

6
ext/iconv/iconv.c
View File

@ -113,14 +113,10 @@ map_charset
VALUE key = rb_funcall2(val, rb_intern("downcase"), 0, 0); VALUE key = rb_funcall2(val, rb_intern("downcase"), 0, 0);
StringValuePtr(key); StringValuePtr(key);
if (st_lookup(RHASH(charset_map)->tbl, key, &val)) { if (st_lookup(RHASH(charset_map)->tbl, key, &val)) {
StringValuePtr(val);
*code = val; *code = val;
} }
} }
else { return StringValuePtr(*code);
StringValuePtr(val);
}
return RSTRING(val)->ptr;
} }
static iconv_t static iconv_t