summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-03-02 14:04:02 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-03-02 14:04:02 +0000
commit01e13c555c269e4d469126e1f0022a01dc3e875d (patch)
treea479afb908b339162ba4196ca4ac35b1c88a4ea9
parent661f93b22a98b49376c7dc826663fa26d67014c0 (diff)
downloadruby-01e13c555c269e4d469126e1f0022a01dc3e875d.tar.gz
ruby-01e13c555c269e4d469126e1f0022a01dc3e875d.tar.xz
ruby-01e13c555c269e4d469126e1f0022a01dc3e875d.zip
* io.c (rb_io_ungetc): reduce redundant call.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15671 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--io.c6
2 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 45a2b3ed5..7e2c5ffe8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Mar 2 23:03:59 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * io.c (rb_io_ungetc): reduce redundant call.
+
Sun Mar 2 10:13:12 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ruby.c (load_file): parse shebang in us-ascii. a patch from
diff --git a/io.c b/io.c
index dad62a45b..55959802a 100644
--- a/io.c
+++ b/io.c
@@ -2429,19 +2429,17 @@ rb_io_readbyte(VALUE io)
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);