diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-10-29 12:28:32 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-10-29 12:28:32 +0000 |
commit | 99be646a7f22dbc7be24b871cb950bf65414f9d5 (patch) | |
tree | 9dbdd9a7fccf3c6553f142c51ad80d3a601cf27f /io.c | |
parent | 383723abc852fc7d7987e498b55c6e78697dbdaf (diff) |
* io.c (rb_io_check_initialized): new function to check uninitialized
object. [ruby-talk:118234]
* file.c (rb_file_path), io.c (rb_io_closed): check if initialized.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7140 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r-- | io.c | 12 |
1 files changed, 10 insertions, 2 deletions
@@ -183,12 +183,19 @@ rb_io_taint_check(io) } void -rb_io_check_closed(fptr) +rb_io_check_initialized(fptr) OpenFile *fptr; { if (!fptr) { rb_raise(rb_eIOError, "uninitialized stream"); } +} + +void +rb_io_check_closed(fptr) + OpenFile *fptr; +{ + rb_io_check_initialized(fptr); if (!fptr->f && !fptr->f2) { rb_raise(rb_eIOError, "closed stream"); } @@ -941,7 +948,7 @@ rb_io_fread(ptr, len, f) if (len > n) { clearerr(f); } - rb_thread_wait_fd(fileno(f)); + rb_thread_wait_fd(fileno(f)); } if (len == n) return 0; } @@ -1889,6 +1896,7 @@ rb_io_closed(io) OpenFile *fptr; fptr = RFILE(io)->fptr; + rb_io_check_initialized(fptr); return (fptr->f || fptr->f2)?Qfalse:Qtrue; } |