diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-27 06:28:34 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-27 06:28:34 +0000 |
| commit | 0964340dc010e4984aa13a2f5f0e07e095372890 (patch) | |
| tree | 8d7590a2f9ed25acaedf7a91c01ea50b7dcceb76 | |
| parent | fbbe50ac0cdfc5c6e76ab200c986dd5d6f49c4c1 (diff) | |
| download | ruby-0964340dc010e4984aa13a2f5f0e07e095372890.tar.gz ruby-0964340dc010e4984aa13a2f5f0e07e095372890.tar.xz ruby-0964340dc010e4984aa13a2f5f0e07e095372890.zip | |
* transcode.c (make_econv_exception): show source and destination
encoding. [ruby-dev:37285]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@21092 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | transcode.c | 8 |
2 files changed, 13 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Sat Dec 27 15:28:12 2008 Tanaka Akira <akr@fsij.org> + + * transcode.c (make_econv_exception): show source and destination + encoding. [ruby-dev:37285] + Sat Dec 27 15:23:38 2008 Koichi Sasada <ko1@atdot.net> * vm_insnhelper.c (vm_yield_with_cfunc): rename parameter name diff --git a/transcode.c b/transcode.c index 72e26f6df..f925daa58 100644 --- a/transcode.c +++ b/transcode.c @@ -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) |