diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-08-28 05:55:22 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-08-28 05:55:22 +0000 |
commit | ffa153f282b8fb94734a3b33ba83cc8566a0231f (patch) | |
tree | b509df29a5c4ccc6aa8e4440c96ec536af223139 /io.c | |
parent | 7a4f70463d13fa2c508dcf3180b98f56559f592b (diff) | |
download | ruby-ffa153f282b8fb94734a3b33ba83cc8566a0231f.tar.gz |
io.c: preserve encodings
* io.c (rb_io_extract_encoding_option): preserve encodings in
warning messages.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47305 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r-- | io.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -5194,9 +5194,9 @@ rb_io_extract_encoding_option(VALUE opt, rb_encoding **enc_p, rb_encoding **enc2 if ((extenc != Qundef || intenc != Qundef) && !NIL_P(encoding)) { if (!NIL_P(ruby_verbose)) { int idx = rb_to_encoding_index(encoding); - rb_warn("Ignoring encoding parameter '%s': %s_encoding is used", - idx < 0 ? StringValueCStr(encoding) : rb_enc_name(rb_enc_from_index(idx)), - extenc == Qundef ? "internal" : "external"); + if (idx >= 0) encoding = rb_enc_from_encoding(rb_enc_from_index(idx)); + rb_warn("Ignoring encoding parameter '%"PRIsVALUE"': %s_encoding is used", + encoding, extenc == Qundef ? "internal" : "external"); } encoding = Qnil; } |