archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

* transcode.c (make_econv_exception): show source and destination

Browse source 
encoding.  [ruby-dev:37285]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21092 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2008-12-27 06:28:34 +00:00
parent 1f8620ca22
commit 415d59e3e4
2 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
transcode.c
View file

@ -2005,6 +2005,14 @@ make_econv_exception(rb_econv_t *ec)
StringValueCStr(dumped),
ec->last_error.source_encoding,
ec->last_error.destination_encoding);
if (strcmp(ec->last_error.source_encoding,
ec->source_encoding_name) != 0 ||
strcmp(ec->last_error.destination_encoding,
ec->destination_encoding_name) != 0) {
rb_str_catf(mesg, " in conversion from %s to %s",
ec->source_encoding_name,
ec->destination_encoding_name);
}
exc = rb_exc_new3(rb_eUndefinedConversionError, mesg);
idx = rb_enc_find_index(ec->last_error.source_encoding);
if (0 <= idx)