nobu	2008-03-02 23:04:02 +0900 (Sun, 02 Mar 2008)

  New Revision: 15671

  Modified files:
    trunk/ChangeLog
    trunk/io.c

  Log:
    * io.c (rb_io_ungetc): reduce redundant call.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15671&r2=15670&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/io.c?r1=15671&r2=15670&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15670)
+++ ChangeLog	(revision 15671)
@@ -1,3 +1,7 @@
+Sun Mar  2 23:03:59 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* io.c (rb_io_ungetc): reduce redundant call.
+
 Sun Mar  2 10:13:12 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* ruby.c (load_file): parse shebang in us-ascii.  a patch from
Index: io.c
===================================================================
--- io.c	(revision 15670)
+++ io.c	(revision 15671)
@@ -2429,19 +2429,17 @@
 VALUE
 rb_io_ungetc(VALUE io, VALUE c)
 {
-    rb_encoding *enc;
     rb_io_t *fptr;
 
     GetOpenFile(io, fptr);
     rb_io_check_readable(fptr);
     if (NIL_P(c)) return Qnil;
-    enc = io_read_encoding(fptr);
     if (FIXNUM_P(c)) {
 	int cc = FIX2INT(c);
+	rb_encoding *enc = io_read_encoding(fptr);
 	char buf[16];
 
-	rb_enc_mbcput(cc, buf, enc);
-	c = rb_str_new(buf, rb_enc_codelen(cc, enc));
+	c = rb_str_new(buf, rb_enc_mbcput(cc, buf, enc));
     }
     else {
 	SafeStringValue(c);

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