summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-11-28 17:02:14 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-11-28 17:02:14 +0000
commitc9994783a3b21e73321f636f2015d5b2dff0a5f4 (patch)
tree21f8164626eb768cb48327897a67142e9db35937
parent55b1f33107022733e04be107c67459cb7de96645 (diff)
downloadruby-c9994783a3b21e73321f636f2015d5b2dff0a5f4.tar.gz
ruby-c9994783a3b21e73321f636f2015d5b2dff0a5f4.tar.xz
ruby-c9994783a3b21e73321f636f2015d5b2dff0a5f4.zip
don't use READ_DATA_PENDING in previous change
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@7406 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--io.c3
2 files changed, 3 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 7e742de8b..7b05ac1cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,7 @@
Mon Nov 29 01:18:18 2004 Tanaka Akira <akr@m17n.org>
- * io.c (rb_io_check_writable): restrict io_seek by
- READ_DATA_PENDING because io_seek(fptr, 0, SEEK_CUR) is
- meaningful only if read buffer is not empty.
- call io_seek regardless of NEED_IO_SEEK_BETWEEN_RW.
- [ruby-dev:24986]
+ * io.c (rb_io_check_writable): call io_seek regardless of
+ NEED_IO_SEEK_BETWEEN_RW. [ruby-dev:24986]
Sun Nov 28 15:57:58 2004 Kouhei Sutou <kou@cozmixng.org>
diff --git a/io.c b/io.c
index 8bc6d9b74..649f27290 100644
--- a/io.c
+++ b/io.c
@@ -261,8 +261,7 @@ rb_io_check_writable(fptr)
if (!(fptr->mode & FMODE_WRITABLE)) {
rb_raise(rb_eIOError, "not opened for writing");
}
- if ((fptr->mode & FMODE_RBUF) && !feof(fptr->f) && !fptr->f2 &&
- READ_DATA_PENDING(fptr->f)) {
+ if ((fptr->mode & FMODE_RBUF) && !feof(fptr->f) && !fptr->f2) {
io_seek(fptr, 0, SEEK_CUR);
}
if (!fptr->f2) {