diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-11-28 17:02:14 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-11-28 17:02:14 +0000 |
commit | a8f25ded9c8e8ccb867112d8092ac903af9e9a8d (patch) | |
tree | 21f8164626eb768cb48327897a67142e9db35937 | |
parent | da9166cc19b2fd9a825d9089307b1e992f35aa08 (diff) | |
download | ruby-a8f25ded9c8e8ccb867112d8092ac903af9e9a8d.tar.gz |
don't use READ_DATA_PENDING in previous change
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7406 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | io.c | 3 |
2 files changed, 3 insertions, 7 deletions
@@ -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> @@ -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) { |