From e8a30cef4040bde984e19fe52b6a1bb2ffa47a89 Mon Sep 17 00:00:00 2001 From: akr Date: Sun, 31 Aug 2008 05:12:32 +0000 Subject: * transcode.c (make_econv_exception): error message simplified. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18978 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ transcode.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5298fb72c..ed10b5753 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sun Aug 31 14:12:06 2008 Tanaka Akira + + * transcode.c (make_econv_exception): error message simplified. + Sun Aug 31 13:47:59 2008 Nobuyoshi Nakada * ext/coverage/coverage.c (rb_mCoverage): removed unneeded static variable. diff --git a/transcode.c b/transcode.c index 9c87a9fa0..420f5752f 100644 --- a/transcode.c +++ b/transcode.c @@ -1648,20 +1648,20 @@ make_econv_exception(rb_econv_t *ec) VALUE bytes2 = Qnil; VALUE dumped2; if (ec->last_error.result == econv_incomplete_input) { - mesg = rb_sprintf("incomplete input: %s on %s", + mesg = rb_sprintf("incomplete %s on %s", StringValueCStr(dumped), ec->last_error.source_encoding); } else if (readagain_len) { bytes2 = rb_str_new(err+error_len, readagain_len); dumped2 = rb_str_dump(bytes2); - mesg = rb_sprintf("invalid byte sequence: %s followed by %s on %s", + mesg = rb_sprintf("%s followed by %s on %s", StringValueCStr(dumped), StringValueCStr(dumped2), ec->last_error.source_encoding); } else { - mesg = rb_sprintf("invalid byte sequence: %s on %s", + mesg = rb_sprintf("%s on %s", StringValueCStr(dumped), ec->last_error.source_encoding); } @@ -1680,7 +1680,7 @@ make_econv_exception(rb_econv_t *ec) VALUE dumped; int idx; dumped = rb_str_dump(bytes); - mesg = rb_sprintf("conversion undefined: %s from %s to %s", + mesg = rb_sprintf("%s from %s to %s", StringValueCStr(dumped), ec->last_error.source_encoding, ec->last_error.destination_encoding); -- cgit