akr	2008-08-31 14:12:32 +0900 (Sun, 31 Aug 2008)

  New Revision: 18978

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=18978

  Log:
    * transcode.c (make_econv_exception): error message simplified.

  Modified files:
    trunk/ChangeLog
    trunk/transcode.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 18977)
+++ ChangeLog	(revision 18978)
@@ -1,3 +1,7 @@
+Sun Aug 31 14:12:06 2008  Tanaka Akira  <akr@f...>
+
+	* transcode.c (make_econv_exception): error message simplified.
+
 Sun Aug 31 13:47:59 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/coverage/coverage.c (rb_mCoverage): removed unneeded static variable.
Index: transcode.c
===================================================================
--- transcode.c	(revision 18977)
+++ transcode.c	(revision 18978)
@@ -1648,20 +1648,20 @@
         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 @@
         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);

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/