usa	2010-05-13 18:20:42 +0900 (Thu, 13 May 2010)

  New Revision: 27783

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

  Log:
    merge from trunk (r27782)
    
    * io.c (swallow): should use more_char() instead of fill_cbuf().
      suggested by akr.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/io.c

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 27782)
+++ ruby_1_9_2/ChangeLog	(revision 27783)
@@ -1,3 +1,8 @@
+Thu May 13 18:20:16 2010  NAKAMURA Usaku  <usa@r...>
+
+	* io.c (swallow): should use more_char() instead of fill_cbuf().
+	  suggested by akr.
+
 Thu May 13 13:09:24 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* vm_core.h (rb_vm_get_sourceline): moved from eval_intern.h for
Index: ruby_1_9_2/io.c
===================================================================
--- ruby_1_9_2/io.c	(revision 27782)
+++ ruby_1_9_2/io.c	(revision 27783)
@@ -2296,7 +2296,6 @@
     if (NEED_READCONV(fptr)) {
 	rb_encoding *enc = io_read_encoding(fptr);
 	int needconv = rb_enc_mbminlen(enc) != 1;
-	VALUE v;
 	make_readconv(fptr, 0);
 	do {
 	    size_t cnt;
@@ -2315,10 +2314,7 @@
 		}
 		io_shift_cbuf(fptr, (int)cnt - i, NULL);
 	    }
-	    v = fill_cbuf(fptr, 0);
-	    if (v != MORE_CHAR_SUSPENDED && v != MORE_CHAR_FINISHED)
-		rb_exc_raise(v);
-	} while (v == MORE_CHAR_SUSPENDED);
+	} while (more_char(fptr) != MORE_CHAR_FINISHED);
 	return FALSE;
     }
 

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