akr	2008-08-27 01:14:49 +0900 (Wed, 27 Aug 2008)

  New Revision: 18876

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

  Log:
    * transcode.c (transcode_loop): simplified.

  Modified files:
    trunk/ChangeLog
    trunk/transcode.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 18875)
+++ ChangeLog	(revision 18876)
@@ -1,3 +1,7 @@
+Wed Aug 27 01:13:54 2008  Tanaka Akira  <akr@f...>
+
+	* transcode.c (transcode_loop): simplified.
+
 Wed Aug 27 01:03:23 2008  Tanaka Akira  <akr@f...>
 
 	* include/ruby/encoding.h (rb_econv_result_t): enumeration constant:
Index: transcode.c
===================================================================
--- transcode.c	(revision 18875)
+++ transcode.c	(revision 18876)
@@ -1763,16 +1763,12 @@
     ret = rb_econv_convert(ec, in_pos, in_stop, out_pos, out_stop, 0);
 
     if (ret == econv_invalid_byte_sequence ||
-        ret == econv_incomplete_input) {
+        ret == econv_incomplete_input ||
+        ret == econv_undefined_conversion) {
         exc = make_econv_exception(ec);
         rb_econv_close(ec);
 	rb_exc_raise(exc);
     }
-    if (ret == econv_undefined_conversion) {
-        exc = make_econv_exception(ec);
-        rb_econv_close(ec);
-	rb_exc_raise(exc);
-    }
 
     if (ret == econv_destination_buffer_full) {
         more_output_buffer(destination, resize_destination, max_output, &out_start, out_pos, &out_stop);
@@ -1831,11 +1827,6 @@
         switch (ret) {
           case econv_invalid_byte_sequence:
           case econv_incomplete_input:
-            exc = make_econv_exception(ec);
-            rb_econv_close(ec);
-            rb_exc_raise(exc);
-            break;
-
           case econv_undefined_conversion:
             exc = make_econv_exception(ec);
             rb_econv_close(ec);

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