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

* transcode.c (econv_opts): set :undef => :replace when

Browse source 
:replace is given and :invalid is not given. [ruby-dev:40554]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26823 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2010-03-05 10:39:56 +00:00
parent 4bcae18e37
commit f453c3c0da
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Fri Mar 5 19:36:12 2010 NARUSE, Yui <naruse@ruby-lang.org>
* transcode.c (econv_opts): set :undef => :replace when
:replace is given and :invalid is not given. [ruby-dev:40554]
Fri Mar 5 17:51:09 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (pipe_open): suppressed a warning.

5
transcode.c
View file

@ -2394,6 +2394,11 @@ econv_opts(VALUE opt)
rb_raise(rb_eArgError, "unknown value for undefined character option");
}
v = rb_hash_aref(opt, sym_replace);
if (!NIL_P(v) && !(ecflags & ECONV_INVALID_REPLACE)) {
ecflags |= ECONV_UNDEF_REPLACE;
}
v = rb_hash_aref(opt, sym_xml);
if (!NIL_P(v)) {
if (v==sym_text) {