kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/iconv/iconv.c (iconv_create): find encoding without options.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16834 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-06-05 05:03:46 +00:00
parent b35b33c751
commit 5d75d9bf3d
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Thu Jun 5 14:03:44 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/iconv/iconv.c (iconv_create): find encoding without options.
Thu Jun 5 07:48:32 2008 Koichi Sasada <ko1@atdot.net>
* string.c (hash): should be "static".

8
ext/iconv/iconv.c
View file

@ -158,7 +158,13 @@ iconv_create(VALUE to, VALUE from, struct rb_iconv_opt_t *opt, int *idx)
const char* fromcode = map_charset(&from);
iconv_t cd;
*idx = rb_enc_find_index(tocode);
if ((*idx = rb_enc_find_index(tocode)) < 0) {
const char *slash = strchr(tocode, '/');
if (slash && slash[1] == '/') {
VALUE tmp = rb_str_new(tocode, slash - tocode);
*idx = rb_enc_find_index(RSTRING_PTR(tmp));
}
}
cd = iconv_open(tocode, fromcode);
if (cd == (iconv_t)-1) {